From baebe224633c06fb17e11299144eae1cb4ad21a5 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 25 Sep 2019 22:25:59 +0000
Subject: [PATCH] fixes bug#15571 dev:valdevir qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@97844 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
index ce1a13cc8..78317148b 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
@@ -113,7 +113,8 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
 		sb.append(" JOIN ROL_OPERATIVO ROL ON COR.ROLOPERATIVO_ID = ROL.ROLOPERATIVO_ID");
 		sb.append(" JOIN CORRIDA_TRAMO CRT ON CRT.CORRIDA_ID = COR.CORRIDA_ID AND CRT.FECCORRIDA = COR.FECCORRIDA");
 		sb.append(" JOIN TRAMO TRM ON TRM.TRAMO_ID = CRT.TRAMO_ID");
-		sb.append(" JOIN TARIFA TA ON TA.TRAMO_ID = TRM.TRAMO_ID AND TA.MARCA_ID = COR.MARCA_ID AND TA.RUTA_ID = COR.RUTA_ID");
+		sb.append(" JOIN RUTA_COMBINACION RC ON RC.RUTA_ID = COR.RUTA_ID AND RC.INDVENTA = 1");
+		sb.append(" JOIN TARIFA TA ON TA.TRAMO_ID = RC.TRAMO_ID AND TA.MARCA_ID = COR.MARCA_ID AND TA.RUTA_ID = COR.RUTA_ID");
 		sb.append(" JOIN VIGENCIA_TARIFA VT ON VT.VIGENCIATARIFA_ID = TA.VIGENCIATARIFA_ID");
 		sb.append(" JOIN PARADA ORI ON ORI.PARADA_ID = COR.ORIGEN_ID");
 		sb.append(" JOIN CIUDAD ORICID ON ORICID.CIUDAD_ID = ORI.CIUDAD_ID");
@@ -186,7 +187,8 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
  		sb.append("  JOIN ROL_OPERATIVO ROL ON COR.ROLOPERATIVO_ID = ROL.ROLOPERATIVO_ID ");
  		sb.append("  JOIN CORRIDA_TRAMO CRT ON CRT.CORRIDA_ID = COR.CORRIDA_ID AND CRT.FECCORRIDA = COR.FECCORRIDA ");
  		sb.append("  JOIN TRAMO TRM ON TRM.TRAMO_ID = CRT.TRAMO_ID ");
- 		sb.append("  JOIN TARIFA TA ON TA.TRAMO_ID = TRM.TRAMO_ID AND TA.MARCA_ID = COR.MARCA_ID AND TA.RUTA_ID = COR.RUTA_ID ");
+		sb.append("  JOIN RUTA_COMBINACION RC ON RC.RUTA_ID = COR.RUTA_ID AND RC.INDVENTA = 1");
+		sb.append("  JOIN TARIFA TA ON TA.TRAMO_ID = RC.TRAMO_ID AND TA.MARCA_ID = COR.MARCA_ID AND TA.RUTA_ID = COR.RUTA_ID");
  		sb.append("  JOIN VIGENCIA_TARIFA VT ON VT.VIGENCIATARIFA_ID = TA.VIGENCIATARIFA_ID ");
  		sb.append("  JOIN PARADA ORI ON ORI.PARADA_ID = COR.ORIGEN_ID ");
  		sb.append("  JOIN CIUDAD ORICID ON ORICID.CIUDAD_ID = ORI.CIUDAD_ID ");