diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java index db5ba9acc..fed0c2214 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java @@ -389,6 +389,7 @@ public class ConferenciaController extends MyGenericForwardComposer { Labels.getLabel("informeIrregularidadeController.window.title"), args); } }); + } private void ajustarListsBilhetes() { @@ -438,12 +439,15 @@ public class ConferenciaController extends MyGenericForwardComposer { List com = lstm.getChildren(); for (Component component : com) { Listcell listCell = (Listcell) component; + Boolean tes = listCell.getFirstChild() instanceof Checkbox; if (listCell.getFirstChild() instanceof Checkbox) { Checkbox chk = (Checkbox) component.getFirstChild(); - chk.setDisabled(getEnableDisableCheckBox(boletoComissao.getConferencia())); - if (!jaPassou) { - chk.setChecked(getCheckedVenta(boletoComissao)); + if (boletoComissao.isConferido() && boletoComissao.getLogconferenciaId() == null) { + gravarLogConferenciaBilhete(bilhetesList, boletoComissao, tabBilhetesVenda, "conferenciaController.tab.bilhetes"); + //chk.setChecked(getCheckedVenta(boletoComissao)); } + chk.setDisabled(getEnableDisableCheckBox(boletoComissao.getConferencia())); + chk.addEventListener("onCheck", new EventListener() { @Override public void onEvent(Event event) throws Exception { @@ -455,6 +459,7 @@ public class ConferenciaController extends MyGenericForwardComposer { } } }); + } } jaPassou = true; @@ -779,6 +784,7 @@ public class ConferenciaController extends MyGenericForwardComposer { } private void carregarBilhetesVendidos(List boletosComissaos, boolean carregarDadosFaltantes) throws BusinessException { + jaPassou = false; if (isPeriodo) { lsBilhetes = conferenciaComissaoService.carregarBilhetesComissao(boletosComissaos, conferencias, BoletoStatusComissao.BOLETOS_VENDIDOS, carregarDadosFaltantes); } else { diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderBoletoComissao.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderBoletoComissao.java index 55e488894..b0b5a9caf 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderBoletoComissao.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderBoletoComissao.java @@ -21,7 +21,7 @@ public class RenderBoletoComissao implements ListitemRenderer { @Override public void render(Listitem lstm, Object o) throws Exception { BoletoComissao boletoComissao = (BoletoComissao) o; - boletoComissao.setConferido(boletoComissao.getLogconferenciaId() != null); + // boletoComissao.setConferido(boletoComissao.getLogconferenciaId() != null); Listcell lc = new Listcell(); if(boletoComissao.isExigeConferenciaAba() || boletoComissao.isExigeConferencia() || boletoComissao.isExigeConferenciaBoletoDevolvido()) {