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 3c2cb216c..54402abed 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 @@ -1688,6 +1688,11 @@ public class ConferenciaController extends MyGenericForwardComposer { private void removerLogConferenciaEventoFinanceiro(EventosFinanceirosVO eventoFinanceiro) { try { LogConferencia logConferencia = conferenciaComissaoService.obtenerLogConferenciaID(eventoFinanceiro.getLogconferenciaId()); + + if(logConferencia == null) { + return; + } + conferenciaComissaoService.borrarLogConferencia(logConferencia); eventoFinanceiro.setLogconferenciaId(null); eventoFinanceiro.setStatus(null); diff --git a/web/gui/comissao/conferencia.zul b/web/gui/comissao/conferencia.zul index 3bf4aff50..e704c6bfb 100644 --- a/web/gui/comissao/conferencia.zul +++ b/web/gui/comissao/conferencia.zul @@ -107,27 +107,13 @@ - +