From 2a30798b5baa0bb8122443d016bccc2b952ab68c Mon Sep 17 00:00:00 2001
From: "daniel.zauli" <daniel.zauli@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 23 Nov 2016 19:33:25 +0000
Subject: [PATCH] fixes bug #8273

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@62830 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../gui/controladores/tarifas/CalcularPeajeController.java   | 5 ++++-
 .../web/utilerias/render/RenderClasseIndicePeaj.java         | 2 +-
 web/gui/catalogos/editarOrgaoConcedente.zul                  | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java
index 4a8a88aca..3bb5a8a97 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java
@@ -13,7 +13,6 @@ import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Radio;
 
 import com.rjconsultores.ventaboletos.constantes.Constantes;
-import com.rjconsultores.ventaboletos.entidad.ClasseIndicePeaje;
 import com.rjconsultores.ventaboletos.entidad.EmpresaImposto;
 import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente;
 import com.rjconsultores.ventaboletos.entidad.Ruta;
@@ -72,6 +71,10 @@ public class CalcularPeajeController extends MyGenericForwardComposer {
 		for (Integer orgaoConcedenteId : Constantes.ORGAOS_CONCEDENTES_CALCULO_ARTESP) {
 			lsOrgaoConcedente.add(orgaoConcedenteService.obtenerID(orgaoConcedenteId));
 		}
+		List<OrgaoConcedente> ls1 = orgaoConcedenteService.buscar("AGEPAN");
+		if(!ls1.isEmpty()){
+			lsOrgaoConcedente.add(ls1.get(0));
+		}	
 	}
 
 	public void onClick$btnCalcularPeaje(Event ev) throws InterruptedException {
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderClasseIndicePeaj.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderClasseIndicePeaj.java
index e3f8d9a50..1efb02c41 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderClasseIndicePeaj.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderClasseIndicePeaj.java
@@ -14,7 +14,7 @@ public class RenderClasseIndicePeaj implements ListitemRenderer {
 	public void render(Listitem arg0, Object arg1) throws Exception {
 		ClasseIndicePeaje classeIndicePeaje = (ClasseIndicePeaje) arg1;
 
-		DecimalFormat decimalFormat = new DecimalFormat("#0.00");
+		DecimalFormat decimalFormat = new DecimalFormat("#0.000");
 
 		Listcell lc = new Listcell(classeIndicePeaje.getClasseServicio().getDescclase());
 		lc.setParent(arg0);
diff --git a/web/gui/catalogos/editarOrgaoConcedente.zul b/web/gui/catalogos/editarOrgaoConcedente.zul
index 13da32d19..fa5e88456 100644
--- a/web/gui/catalogos/editarOrgaoConcedente.zul
+++ b/web/gui/catalogos/editarOrgaoConcedente.zul
@@ -66,7 +66,7 @@
 									value="${c:l('busquedaOrgaoConcedenteController.indicePeaje.label')}" />
 								<textbox id="txtIndicePeaje"
 									maxlength="8" mold="rounded"
-									constraint=" no negative, /[0-9]+(\,[0-9][0-9]?)?|/ "
+									constraint=" no negative, /[0-9]+(\,[0-9][0-9][0-9]?)?|/ "
 									use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal" />
 							</row>
 							<row>
@@ -91,7 +91,7 @@
 								value="${c:l('busquedaOrgaoConcedenteController.indicePeaje.label')}" />
 							<textbox id="txtIndicePeajClasse"
 								maxlength="8" mold="rounded"
-								constraint=" no negative, /[0-9]+(\,[0-9][0-9]?)?|/ "
+								constraint=" no negative, /[0-9]+(\,[0-9][0-9][0-9]?)?|/ "
 								use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal" />
 
 							<button id="btnAdicionarClassePeaje"