From dd4018ee2e7d467a4a702a52107b325c05e49397 Mon Sep 17 00:00:00 2001
From: valdir <valdir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 29 Oct 2021 13:41:41 +0000
Subject: [PATCH] =?UTF-8?q?0023469:=20Adamantina=20-=20GLPI=20-=2042846=20?=
 =?UTF-8?q?Presta=C3=A7=C3=A3o=20de=20contas=20-=20conferencia=20de=20movi?=
 =?UTF-8?q?mento=20bug#23469=20dev:wallace=20qua:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@109367 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../comissao/ConferenciaController.java        |  5 +++++
 web/gui/comissao/conferencia.zul               | 18 ++----------------
 2 files changed, 7 insertions(+), 16 deletions(-)

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 @@
 							<column width="21%" />
 						</columns>
 						<rows>
-							<row>
+							<row spans="1,5">
 								<label
 									value="${c:l('conferenciaController.lhTotalDeposito.value')}" />
 								<textbox id="totalDeposito"
-									width="50%"
+									width="12%"
 									value="@{winConferencia$composer.resumo.valorDepositoFormatado}"
 									readonly="true" style="text-align:right" />
-
-								<label id="lbValorEmCaixa"
-									value="${c:l('conferenciaController.lhValorEmCaixa.value')}" />
-								<textbox id="txtValorEmCaixa"
-									width="50%"
-									value="@{winConferencia$composer.resumo.valorEmCaixaFormatado}"
-									readonly="true" style="text-align:right" />
-
-								<label id="lbComissaoRetida"
-									value="${c:l('conferenciaController.lhComissaoRetida.value')}" />
-								<textbox id="txtComissaoRetida"
-									width="50%"
-									value="@{winConferencia$composer.resumo.comissaoRetidaFormatado}"
-									readonly="true" style="text-align:right" />
 							</row>
 							<row spans="1,5">
 								<label