diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java index e2f0f4163..048aaa240 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java @@ -78,12 +78,6 @@ public class BusquedaConferenciaComissaoController extends MyGenericForwardCompo Messagebox.OK, Messagebox.ERROR); return false; } - if(cmbPuntoVenta.getSelectedItem().getValue() == null || ((PuntoVenta)cmbPuntoVenta.getSelectedItem().getValue()).getPuntoventaId() == -1) { - Messagebox.show(Labels.getLabel("MSG.Error.necessita.puntoVenta"), - Labels.getLabel("conferenciaComissaoController.window.title"), - Messagebox.OK, Messagebox.ERROR); - return false; - } return true; } 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 f2d55cc4c..094e469ca 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 @@ -927,16 +927,18 @@ public class ConferenciaController extends MyGenericForwardComposer { private void carregarDadosConferencia() { try { DiaConferenciaComissaoVO diaConferenciaComissao = conferenciaComissaoService.carregarConferenciaRegistrada(conferencia.getDatamovimento(), conferencia.getEmpresa(), puntoventaFiltro); - for (DiaConferenciaComissaoVO diaConferenciaComissaoAux : conferenciaComissao.getDiasOrdenado()) { - if(diaConferenciaComissao.equals(diaConferenciaComissaoAux)) { - diaConferenciaComissaoAux.setIndboletogerado(diaConferenciaComissao.getIndboletogerado()); - diaConferenciaComissaoAux.setIndconferido(diaConferenciaComissao.getIndconferido()); - diaConferenciaComissaoAux.setIndmaloterecebido(diaConferenciaComissao.getIndmaloterecebido()); - diaConferenciaComissaoAux.setIndpendencia(diaConferenciaComissao.getIndpendencia()); - diaConferenciaComissaoAux.setIndsemmovimento(diaConferenciaComissao.getIndsemmovimento()); + if(diaConferenciaComissao != null) { + for (DiaConferenciaComissaoVO diaConferenciaComissaoAux : conferenciaComissao.getDiasOrdenado()) { + if(diaConferenciaComissao.equals(diaConferenciaComissaoAux)) { + diaConferenciaComissaoAux.setIndboletogerado(diaConferenciaComissao.getIndboletogerado()); + diaConferenciaComissaoAux.setIndconferido(diaConferenciaComissao.getIndconferido()); + diaConferenciaComissaoAux.setIndmaloterecebido(diaConferenciaComissao.getIndmaloterecebido()); + diaConferenciaComissaoAux.setIndpendencia(diaConferenciaComissao.getIndpendencia()); + diaConferenciaComissaoAux.setIndsemmovimento(diaConferenciaComissao.getIndsemmovimento()); + } } + conferenciaList.updateItem(conferenciaComissao); } - conferenciaList.updateItem(conferenciaComissao); } catch (BusinessException e) { log.error(e.getMessage(), e); }