From 81acd80b591e67136c8b9f0fcfd49b83081db0bc Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 28 Mar 2016 21:37:26 +0000
Subject: [PATCH] fixes bug #7178

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@54331 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioCancelamentoVendaCartao.java       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java
index 0827187d4..664b88ad4 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java
@@ -84,6 +84,10 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio {
 		   .append("                    AND B.FECCORRIDA IS NOT NULL ")
 		   .append("INNER JOIN CAJA C ON C.NUMOPERACION = B.NUMOPERACION ")
 		   .append("                  AND B.NUMASIENTO = C.NUMASIENTO ")
+		   .append("                  AND B.ORIGEN_ID = C.ORIGEN_ID ")
+		   .append("                  AND B.DESTINO_ID = C.DESTINO_ID ")
+		   .append("                  AND B.CATEGORIA_ID = C.CATEGORIA_ID ")
+		   .append("                  AND B.CLASESERVICIO_ID = C.CLASESERVICIO_ID ")
 		   .append("INNER JOIN CAJA_DET_PAGO CDT ON CDT.CAJA_ID = C.CAJA_ID AND CDT.FORMAPAGO_ID = :formaPago1 ")
 		   .append("INNER JOIN CAJA_TARJETA CTJ ON CDT.CAJADETPAGO_ID = CTJ.CAJADETPAGO_ID ")
 		   .append("INNER JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = B.PUNTOVENTA_ID ")
@@ -117,6 +121,10 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio {
 		   .append("                     AND BR.FECCORRIDA IS NOT NULL ")
 		   .append("INNER JOIN CAJA C ON C.NUMOPERACION = BR.NUMOPERACION ")
 		   .append("                  AND BR.NUMASIENTO = C.NUMASIENTO ")
+		   .append("                  AND BR.ORIGEN_ID = C.ORIGEN_ID ")
+		   .append("                  AND BR.DESTINO_ID = C.DESTINO_ID ")
+		   .append("                  AND BR.CATEGORIA_ID = C.CATEGORIA_ID ")
+		   .append("                  AND BR.CLASESERVICIO_ID = C.CLASESERVICIO_ID ")		   
 		   .append("INNER JOIN CAJA_DET_PAGO CDT ON CDT.CAJA_ID = C.CAJA_ID AND CDT.FORMAPAGO_ID = :formaPago1 ")
 		   .append("INNER JOIN CAJA_TARJETA CTJ ON CDT.CAJADETPAGO_ID = CTJ.CAJADETPAGO_ID ")
 		   .append("INNER JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = BR.PUNTOVENTA_ID ")
@@ -150,6 +158,10 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio {
 		   .append("                    AND B.FECCORRIDA IS NULL ")
 		   .append("INNER JOIN CAJA C ON C.NUMOPERACION = B.NUMOPERACION ")
 		   .append("                  AND B.NUMFOLIOSISTEMA = C.NUMFOLIOSISTEMA ")
+		   .append("                  AND B.ORIGEN_ID = C.ORIGEN_ID ")
+		   .append("                  AND B.DESTINO_ID = C.DESTINO_ID ")
+		   .append("                  AND B.CATEGORIA_ID = C.CATEGORIA_ID ")
+		   .append("                  AND B.CLASESERVICIO_ID = C.CLASESERVICIO_ID ")		   
 		   .append("INNER JOIN CAJA_DET_PAGO CDT ON CDT.CAJA_ID = C.CAJA_ID AND CDT.FORMAPAGO_ID = :formaPago1 ")
 		   .append("INNER JOIN CAJA_TARJETA CTJ ON CDT.CAJADETPAGO_ID = CTJ.CAJADETPAGO_ID ")
 		   .append("INNER JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = B.PUNTOVENTA_ID ")