From 4aa4dbbc32d3da5440c551280b8a0d43842fde4a Mon Sep 17 00:00:00 2001
From: valdevir <valdevir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 8 Nov 2016 13:14:27 +0000
Subject: [PATCH] fixes bug #7985

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@62412 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../comissao/ConferenciaController.java              | 12 +-----------
 web/gui/comissao/conferencia.zul                     |  5 ++++-
 2 files changed, 5 insertions(+), 12 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 4963f692f..21df547a2 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
@@ -22,7 +22,6 @@ import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
-import org.zkoss.zul.Label;
 import org.zkoss.zul.Listcell;
 import org.zkoss.zul.Listitem;
 import org.zkoss.zul.Radio;
@@ -176,7 +175,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
 
 	private ConferenciaComissaoVO conferenciaComissao;
 
-	private Label lblTipoInformativo;
 	private Combobox cmbTipoInformativo;
 	
 	private List<TipoInformativoComissao> lsTipoInformativo;
@@ -208,7 +206,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
 
 		ocdsList.setItemRenderer(new RenderOcd() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public void render(Listitem lstm, Object o) throws Exception {
 				super.render(lstm, o);
 				final OcdVO ocd = (OcdVO) o;
@@ -243,7 +240,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
 
 		eventosFinanceirosList.setItemRenderer(new RenderEventosFinanceiros() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public void render(Listitem lstm, Object o) throws Exception {
 				super.render(lstm, o);
 				final EventosFinanceirosVO eventoFinanceiro = (EventosFinanceirosVO) o;
@@ -264,6 +260,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
 								}
 							}
 						});
+						break;
 					}
 				}
 			}
@@ -319,7 +316,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
 	private void ajustarListsBilhetes() {
 		bilhetesManualList.setItemRenderer(new RenderBoletoComissao() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public void render(Listitem lstm, Object o) throws Exception {
 				super.render(lstm, o);
 				final BoletoComissao boletoComissao = (BoletoComissao) o;
@@ -354,7 +350,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
 
 		bilhetesList.setItemRenderer(new RenderBoletoComissao() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public void render(Listitem lstm, Object o) throws Exception {
 				super.render(lstm, o);
 				final BoletoComissao boletoComissao = (BoletoComissao) o;
@@ -389,7 +384,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
 
 		bilhetesCanceladosList.setItemRenderer(new RenderBoletoComissao() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public void render(Listitem lstm, Object o) throws Exception {
 				super.render(lstm, o);
 				final BoletoComissao boletoComissao = (BoletoComissao) o;
@@ -424,7 +418,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
 
 		bilhetesDevolvidosList.setItemRenderer(new RenderBoletoComissao() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public void render(Listitem lstm, Object o) throws Exception {
 				super.render(lstm, o);
 				final BoletoComissao boletoComissao = (BoletoComissao) o;
@@ -459,7 +452,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
 
 		bilhetesGapList.setItemRenderer(new RenderBoletoComissao() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public void render(Listitem lstm, Object o) throws Exception {
 				super.render(lstm, o);
 				final BoletoComissao boletoComissao = (BoletoComissao) o;
@@ -494,7 +486,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
 
 		bilhetesGapCanceladosList.setItemRenderer(new RenderBoletoComissao() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public void render(Listitem lstm, Object o) throws Exception {
 				super.render(lstm, o);
 				final BoletoComissao boletoComissao = (BoletoComissao) o;
@@ -529,7 +520,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
 
 		bilhetesGapDevolvidosList.setItemRenderer(new RenderBoletoComissao() {
 			@Override
-			@SuppressWarnings("unchecked")
 			public void render(Listitem lstm, Object o) throws Exception {
 				super.render(lstm, o);
 				final BoletoComissao boletoComissao = (BoletoComissao) o;
diff --git a/web/gui/comissao/conferencia.zul b/web/gui/comissao/conferencia.zul
index daff110ae..9897189a1 100644
--- a/web/gui/comissao/conferencia.zul
+++ b/web/gui/comissao/conferencia.zul
@@ -698,10 +698,13 @@
 					<listbox id="eventosFinanceirosList"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
 						vflex="true" multiple="false" height="200px">
-						<listhead sizable="true">
+						<listhead sizable="true">							
 							<listheader
 								label="${c:l('conferenciaController.lhConferido.value')}"
 								width="70px" align="center" sort="auto(orderExigeConferencia)" />
+							<listheader
+								label="${c:l('conferenciaController.lhBoletoId.value')}"
+								align="center" sort="auto(idBoleto)" />
 							<listheader image="/gui/img/builder.gif"
 								label="${c:l('conferenciaController.lhNumdocumento.value')}"
 								sort="auto(numdocumento)" />