From 175d21a357cdaec96fe509caf131b7f62d926480 Mon Sep 17 00:00:00 2001
From: celio <celio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 24 Feb 2022 22:18:08 +0000
Subject: [PATCH] fixes bug#24053 dev: JULIO qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@111027 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../RelatorioPassageirosViajar.jasper         | Bin 36258 -> 36288 bytes
 .../RelatorioPassageirosViajar.jrxml          |   6 ++++--
 .../RelatorioPassageirosViajarController.java |   4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper
index 84c561a19271f16cd510c1e01f9a7ba2312fc6c9..ea566c6d97eaa128c1e819fa205705c03b00738b 100644
GIT binary patch
delta 889
zcmZvaOH30{6o&6DeO$m&K<Jal_}C~$z?4=6B}19w$j~V>QzUH0S{gb->5J;d!~_x~
zfF{PXF(Dz*tuaa_h8SYR7-Nh9F$7(jxN_r$HAbh{q%~o47w3Hcx&Qg^eX?xWST?-C
z1S2qzub4pZV4G&FyynDasIj*}xYDRC9oukYlg9NdTXBW<lik924%P;@%s0}>cs{Ky
zaN9V@R#6lcO^s7A^{kQ_k400lcrqGO(kbc^)j^eYr_y=lR=Nz3m2pa$rcyVPNf-;Q
z)R;~c=*)B$-7$D7;4$kk8$39V{2Irvn=#SI$Zj<@LhWe>Y+feX?`X<|Yauz|)X%wz
zK9|qi<@a`6==Ax!e6s(%&+F~5AdJx&$eNm9e}aNviVf-=Eudx^a5vZzP2f>ou&=bj
z^+dD1F%!*2r{ei|P8NAVl7lS6^^0&jaRNBC88#9QSV<fQMQwq-gu~@5;Q|vb2m*Xa
zVn!vfC<`#J9<8q{5fL#$3oH+h)RXW)xd_{8Z~1-wv_#8nhz+p3W}W<Dv=%3Fe1PT{
z*iX-QTd&e$m=WZE9fF=>bc7S-04*^Cyui`~J;SKJs2gDgDMEAX7$Xq$9A+|&!YW49
zWor?nVboB>gDl7BgGHVjDF|L-R9ozb0f7xm93v65hEWwW6xK1_YCl1*U^V0JS;wfZ
z$m;8dn1ICcA%b4(@WE0+Hbip-y}_uagcVXE=<UO-6Tbsjw$=5%Wc@%T@)04x5cC0t
zvo7~XjLf=4so?DsMwVij1Z_fl&h7YIvO7eN>aP$9>C?Z!Ot#U!gOM#viy}S149RpK
zBS?BsyO7LzY~S=i%5$H~wcGF{d|zzE!|-SE3YN8&**4?<C1{zYw4J-vhm{jcd)R)+
QC(NUB&}nIcd-v^s0nE)39smFU

delta 1001
zcmZuvU2F_d6h3FO)oZu^e_OkyQxV$KPl~Ggt7|&Dz0A&RW@h~~lCi3_v#n~k6(T}H
zQlar6=aES8Mg*CNh=_`aAWB1d@!(P7&AY^OEsJ=#H#z6~&iTH3&YimCyLQQU2N?#)
z$3A#>*N#@#KYv%fFEB<^$;OLQK}yW`yOT{*VGqTD5PjOj+`&yJO409r5z~lg=>Cpr
ze_tw-awpZdh<>`NU0JoXB_K&sYWRTE+}xL0IndwNcQ~7M4x}V!Od38iG}Iy;&PvTA
zW211=7xB?m5i0XVa2&d%&C)V!SxbwX(I3vkfV*_(Y;aC`Ux;3BVQysqa8bDAC<A~B
z@4&HKhsv(4a{-jl^@H0Mtm)`zU%R$#edoH4PJ3N@duL}`F(ATn8ZBy|eS^i+lwLsR
z(&bbYTI9vSKq8e*9qJ$N&u*mYbR!ixP1NfwCfNzmT_;joGx7_!ySc^fsL;4dFP(FA
zIkTaz_8(MeLKZr$NH<V*rfSJfVOUA7ieAM)s4H+))0VlV#B@V&`kD?$!UfDw61rj8
zrfi6Wr79L3cO)`1)pR_wxT><iOPWb;cv|l>++8vF*<ZSyn+e6Rf7VlY<ZP%S-^&tl
z#qQNLg~3gP8me$={0wd(9g;)q8Qew)DDi}$nA{fK4DKS7<tt@fvy|Ny1J~me-p}A3
zQd_k46odN+;XFBMsCEz6x>e6bl*^WG>|yW#p(>B(>P<aq$exjho)KZ%BBtqvVkdaa
zo2w;sjlm;?U&iBnw=L^Q%`@=0khMIssy9B9oq{I_!Cc>;lV|W0p){|j>M~b7sb>WX
ze=LN-bA*yVH^JbA*Ug-pepD!Gx5?mDLG|}S7`#TP%xTcTXj$nSgn3b+T8hD7h8AYS
zOWq+A=hwqv7NI=BO_RrzxXrgIhQ%3tM2ai*?)B`da!k_q^Nkpzg_AvakY*+%ckk(-
g|L?RrGtv4_D#x6d{DyV^`Satjn%asR=*ES*A0JdCRR910

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml
index 258d36666..275c1419e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml
@@ -19,7 +19,7 @@
 		<![CDATA[select cj.numseriepreimpresa, nvl(cj.empresacorrida_id, ma.marca_id) empresacorrida_id,
        em.nombempresa, es.cveestado, cj.numfoliosistema, cj.fechorventa, cj.feccorrida,
        cj.preciopagado
-  from caja cj,
+  from boleto cj,
        empresa em,
        punto_venta pv,
        parada pa,
@@ -34,9 +34,11 @@
    and pa.ciudad_id = ci.ciudad_id
    and ci.estado_id = es.estado_id
    and nvl(cj.empresacorrida_id, ma.empresa_id) = $P{EMPRESA_ID}
+   and cj.indcancelacion = 0 
+   and cj.motivocancelacion_id is null
    $P!{LS_CATEGORIA}
    and trunc(cj.fechorventa) between trunc($P{DATA_INICIO}) and trunc($P{DATA_FINAL})
-   and ((cj.feccorrida is null) or ($P{PASSAGEM_ABERTA} = 'T'))
+   $P!{PASSAGEM_ABERTA}
  order by em.nombempresa, es.cveestado, cj.fechorventa]]>
 	</queryString>
 	<field name="NUMSERIEPREIMPRESA" class="java.lang.String"/>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java
index 99088738f..cf900c2de 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java
@@ -214,9 +214,9 @@ public class RelatorioPassageirosViajarController extends MyGenericForwardCompos
 
 		parametros.put("DATA_INICIO", datInicial.getValue());
 		parametros.put("DATA_FINAL", datFinal.getValue());
-		String passagemAberta = "";
+		String passagemAberta = " and (cj.feccorrida is null and cj.corrida_id is null) ";
 		if (!chkPassageiroAberto.isChecked()) {
-			passagemAberta = "T";
+			passagemAberta = " and (cj.feccorrida is not null and cj.corrida_id not is null) ";
 		}
 		parametros.put("PASSAGEM_ABERTA", passagemAberta);
 		Empresa e = (Empresa) cmbEmpresa.getSelectedItem().getValue();