From 87dc4886b9a27940a131792d3e2fb233a832efb3 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 4 May 2016 19:52:39 +0000
Subject: [PATCH] fixes bug #7406

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@55576 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../controladores/comissao/ConferenciaController.java    | 9 ++++++---
 web/WEB-INF/i3-label_pt_BR.label                         | 2 +-
 2 files changed, 7 insertions(+), 4 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 4d089507f..a66628bf7 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
@@ -861,13 +861,13 @@ public class ConferenciaController extends MyGenericForwardComposer {
 	
 	public void onClick$btnPesquisaBoletoDevolvido(Event event) throws InterruptedException {
 		try {
-			if((empresa.getIndcarboletosdevolvidosconf() == null || !empresa.getIndcarboletosdevolvidosconf()) &&
+/*			if((empresa.getIndcarboletosdevolvidosconf() == null || !empresa.getIndcarboletosdevolvidosconf()) &&
 				StringUtils.isBlank(conferencia.getNumfoliosistema())) {
 				 Messagebox.show(Labels.getLabel("conferenciaController.msg.numfoliosistemaNaoInformado"),
 		    				Labels.getLabel("conferenciaController.window.title"),
 		    				Messagebox.OK,Messagebox.INFORMATION);
 				 return;
-			}
+			}*/
 			lsBilhetesDevolvidos = conferenciaComissaoService.carregarBilhetesComissao(null, conferencia, BoletoStatusComissao.BOLETO_DEVOLVIDO);
 			
 			Map<BoletoStatusComissao, BigDecimal> totais = conferenciaComissaoService.totalizarBoletoComissaoDevolvidosTrocaOcd(lsBilhetesDevolvidos);
@@ -1002,7 +1002,9 @@ public class ConferenciaController extends MyGenericForwardComposer {
 	}*/
 
 	private void removerLogConferencia(Long logconferenciaId) {
-		logsConferenciaList.removeItem(new LogConferenciaVO(logconferenciaId));
+		LogConferenciaVO log = new LogConferenciaVO(logconferenciaId);
+		logsConferenciaList.removeItem(log);
+		lsLogsConferencia.remove(log);
 	}
 
 	private LogConferencia gravarLogConferencia(TipoLogConferencia tipo, Long id, String numfoliosistema) throws BusinessException {
@@ -1043,6 +1045,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
 		logConferenciaVO.setStatus(logConferencia.getStatus().getValue());
 		logConferenciaVO.setTipo(logConferencia.getTipo().getValue());
 		logsConferenciaList.updateItem(logConferenciaVO);
+		lsLogsConferencia.add(logConferenciaVO);
 	}
 
 	/*@SuppressWarnings("unchecked")
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index f4e63a728..45573aa46 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -6381,7 +6381,7 @@ conferenciaController.msg.adicionarLogConferencia = Observação adicionada com
 conferenciaController.msg.removerLogConferencia = Observação removido com sucesso
 conferenciaController.lhNumAsiento.value = Assento
 conferenciaController.lhNumFolioSistema.value = Nº Bilhete
-conferenciaController.lhNombpasajero.value = Pasajero
+conferenciaController.lhNombpasajero.value = Passageiro
 conferenciaController.lhNumSeriePreimpresa.value = Série Pré-impressa
 conferenciaController.lhNumFolioPreImpreso.value = Folio Pré-impresso
 conferenciaController.lhUf.value = UF