From bf833d22aa9d5e511f4810bf00436ebc8a84f1a2 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 11 May 2016 21:38:47 +0000
Subject: [PATCH] fixes bug #7462

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

diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOcd.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOcd.java
index cf3830159..42948fc20 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOcd.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOcd.java
@@ -17,6 +17,9 @@ public class RenderOcd implements ListitemRenderer {
 		
 		Listcell lc = new Listcell(ocd.getNumoperacion());
         lc.setParent(lstm);
+
+        lc = new Listcell(ocd.getNumFolioSistema());
+        lc.setParent(lstm);
         
         lc = new Listcell(ocd.getFecpago() != null ? DateUtil.getStringDate(ocd.getFecpago(), "dd/MM/yyyy") : "");
         lc.setParent(lstm);
@@ -30,7 +33,7 @@ public class RenderOcd implements ListitemRenderer {
         lc = new Listcell(ocd.getStatusDescricao());
         lc.setParent(lstm);
 
-        lc = new Listcell(ocd.getNombusuario());
+        lc = new Listcell(ocd.getNombusuarioLogin());
         lc.setParent(lstm);
 
         lstm.setAttribute("data", ocd);
diff --git a/web/gui/comissao/conferencia.zul b/web/gui/comissao/conferencia.zul
index f115e83f2..0da7cae28 100644
--- a/web/gui/comissao/conferencia.zul
+++ b/web/gui/comissao/conferencia.zul
@@ -742,6 +742,9 @@
 							<listheader image="/gui/img/builder.gif"
 								label="${c:l('conferenciaController.lhNumoperacion.value')}"
 								sort="auto(numoperacion)" />
+							<listheader image="/gui/img/builder.gif"
+								label="${c:l('conferenciaController.lhNumFolioSistema.value')}"
+								sort="auto(numFolioSistema)" />								
 							<listheader image="/gui/img/builder.gif"
 								label="${c:l('conferenciaController.lhFecpago.value')}"
 								sort="auto(fecpago)" />
@@ -756,7 +759,7 @@
 								sort="auto(situacaoObservacao)" />
 							<listheader image="/gui/img/builder.gif"
 								label="${c:l('conferenciaController.lhNombusuario.value')}"
-								sort="auto(nombusuario)" />
+								sort="auto(nombusuarioLogin)" />
 						</listhead>
 					</listbox>