From 301fbc8006e0f4c19a32a8ef7512407ba0cb4110 Mon Sep 17 00:00:00 2001
From: tharcisio <tharcisio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 29 Jun 2016 21:50:08 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7585:=20Modifica=C3=A7=C3=A3o=20?=
 =?UTF-8?q?na=20tela=20Altera=C3=A7=C3=A3o=20de=20Pre=C3=A7o=20do=20meu=20?=
 =?UTF-8?q?C=C3=A1lculo=20Pre=C3=A7o=20e=20Adm.=20Pre=C3=A7o=20mel.:=20alt?=
 =?UTF-8?q?erar=20o=20cabe=C3=A7alho=20da=20coluna=20linha=20para=20prefix?=
 =?UTF-8?q?o=20linha=20mel.:=20acrescentar=20no=20grid=20o=20campo=20de=20?=
 =?UTF-8?q?n=C3=BAmero=20da=20linha?=
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@57464 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../web/utilerias/render/RenderTarifa.java        | 15 +++++++++++----
 web/WEB-INF/i3-label_es_MX.label                  |  2 +-
 web/WEB-INF/i3-label_pt_BR.label                  |  2 +-
 web/gui/tarifas/busquedaTarifas.zul               |  2 ++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarifa.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarifa.java
index ad2a85f6e..48cbe76e1 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarifa.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarifa.java
@@ -111,11 +111,18 @@ public class RenderTarifa implements ListitemRenderer {
             lc = new Listcell("");
         }
         lc.setParent(lstm);
-        
-        if (t.getRuta() != null){
-        	lc = new Listcell(t.getRuta().getPrefixo());
+
+        if (t.getRuta() != null) {
+            lc = new Listcell(t.getRuta().getPrefixo());
         } else {
-        	lc = new Listcell("");
+            lc = new Listcell("");
+        }
+        lc.setParent(lstm);
+
+        if (t.getRuta() != null) {
+            lc = new Listcell(t.getRuta().getNumRuta());
+        } else {
+            lc = new Listcell("");
         }
         lc.setParent(lstm);
 
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index ae6d2287e..391be55a6 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -2173,7 +2173,7 @@ busquedaTarifaController.lhTipoPuntoVenta.label = Canal de venta
 busquedaTarifaController.lhCategoria.label = Tipo de pasaje
 busquedaTarifaController.lhTramo.label = Tramo
 busquedaTarifaController.lhOrgao.label = Instituición
-busquedaTarifaController.lhLinha.label = Linea
+busquedaTarifaController.lhLinha.label = Prefixo Linea
 busquedaTarifaController.lhNumLinha.label = Número Linea
 busquedaTarifaController.lhPedagio.label = Peaje
 busquedaTarifaController.lhTaxa.label = Tasa de abordaje
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 93211ad39..e5c6cfb8e 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -2228,7 +2228,7 @@ busquedaTarifaController.lhTipoPuntoVenta.label = Canal de Venda
 busquedaTarifaController.lhCategoria.label = Tipo de Passagem
 busquedaTarifaController.lhTramo.label = Trecho
 busquedaTarifaController.lhOrgao.label = Órgão
-busquedaTarifaController.lhLinha.label = Linha
+busquedaTarifaController.lhLinha.label = Prefixo Linha
 busquedaTarifaController.lhNumLinha.label = Número Linha
 busquedaTarifaController.lhPedagio.label = Pedágio
 busquedaTarifaController.lhTaxa.label = Taxa de Embarque
diff --git a/web/gui/tarifas/busquedaTarifas.zul b/web/gui/tarifas/busquedaTarifas.zul
index c22f3cd3e..891cbc941 100644
--- a/web/gui/tarifas/busquedaTarifas.zul
+++ b/web/gui/tarifas/busquedaTarifas.zul
@@ -122,6 +122,8 @@
                     label="${c:l('busquedaTarifaController.lhOrgao.label')}" sort="auto(orgaoConcedente.descOrgao)"/>
                 <listheader id="lhRuta" width="6%" image="/gui/img/builder.gif"
                     label="${c:l('busquedaTarifaController.lhLinha.label')}" sort="auto(ruta.prefixo)"/>
+                <listheader id="lhNumRuta" width="6%" image="/gui/img/builder.gif"
+                    label="${c:l('busquedaTarifaController.lhNumLinha.label')}" sort="auto(ruta.numRuta)"/>
             </listhead>
         </listbox>
     </window>