From 5f657267519a62e33b5acd0281301b1f51a0e64f Mon Sep 17 00:00:00 2001
From: leonardo <leonardo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 3 Jan 2014 13:30:57 +0000
Subject: [PATCH] =?UTF-8?q?0004784:=20Pricing=20-=20Nova=20tela=200004788:?=
 =?UTF-8?q?=20Modifica=C3=A7=C3=A3o=20Massiva=20de=20Pre=C3=A7o=20-=20Adic?=
 =?UTF-8?q?ionar=20componente=20de=20Ped=C3=A1gio?=
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/Model/trunk/modelWeb@32915 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java | 2 +-
 .../service/impl/PricingOcupaAntecipaServiceImpl.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java
index e60803a9a..df5b399b8 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java
@@ -263,7 +263,7 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO<RutaCombina
         hql.append(" R.DESCRUTA,M.DESCMARCA, ");
         hql.append(" CS.DESCCLASE,VT.feciniciovigencia, ");
         hql.append(" VT.fecfinvigencia,MON.descmoneda, ");
-        hql.append(" T.preciooriginal, T.PRECIO,R.RUTA_ID,MON.moneda_id,VT.VIGENCIATARIFA_ID,M.MARCA_ID  ");
+        hql.append(" T.preciooriginal, T.PRECIO,R.RUTA_ID,MON.moneda_id,VT.VIGENCIATARIFA_ID,M.MARCA_ID, T.IMPORTEPEDAGIO  ");
         hql.append(" FROM  ");
         hql.append(" RUTA_COMBINACION RC   ");
         hql.append(" inner join  RUTA R on (RC.RUTA_ID = R.RUTA_ID) ");
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java
index 4a9ba2fdb..fb2338a2c 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java
@@ -65,6 +65,7 @@ public class PricingOcupaAntecipaServiceImpl implements PricingOcupaAntecipaServ
 	}
 
 	private boolean traslapa(PricingOcupaAntecipa pricingOcupaAntecipa) {
+				
 		boolean traslapa = false;
 		List<PricingOcupaAntecipa> lsSalvos = pricingOcupacionDAO.buscarOcupaAntecipaPricing(pricingOcupaAntecipa.getPricing().getPricingId());
 
@@ -87,7 +88,6 @@ public class PricingOcupaAntecipaServiceImpl implements PricingOcupaAntecipaServ
 		boolean validaCantDias = ((cantdiasmin != null) && (cantdiasmax != null));
 
 		for (PricingOcupaAntecipa poa : lsSalvos) {
-
 			boolean traslapaCantPorcentaje = false;
 			if (validaCantPorcentaje) {
 				if ((poa.getOcupacioninicial() != null) && (poa.getOcupacionfinal() != null)) {