From 3a0dd6dbe76284e7022f04bc67cbd546d6af6351 Mon Sep 17 00:00:00 2001
From: marcus <marcus@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 31 Jul 2013 15:22:45 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@29602
 d1611594-4594-4d17-8e1d-87c2c4800839

---
 .../RelatorioPassageirosViajar.jasper         | Bin 36080 -> 36176 bytes
 .../RelatorioPassageirosViajar.jrxml          |  17 +++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper
index 2711ecd67e14d6464391a135bf8995929a4722d1..7fc1039d9aa774635a692cc9e777d4745aa8a6ae 100644
GIT binary patch
delta 413
zcmew`lj*`NrVYy82~0`FsX3|1B?`$|dU>U}#i>P^sRc!;nYlosI8jF-uPjFcD3uD~
zC+8OxWu_#?XQt>V<R<FnCKe@wIGPHW@>~jFFuBuDNdRbYT7FJuesN}TNosDQ&g2>1
z^6W4L+r8_<bf6rdp+FOXB$q;YMru(i$W@8SC7EUU3bqP{AVrCJDfrz4bqUB-lYjZF
z(ZK5gWW~FElo<IYd;91!hEJ~c(b>Grx0j1uBp|W4I5B;*WyD@St97UT?b^q{z@Wz%
z$jG2p0G3J3EXpqq%S_BlEQ&WYHa9ggw=}Rcvam3VH?=S`G&EsnU}R*_nOw*!Gx<Uh
Y`{tnZ5LIzetSU<;Gg`_`zSScJ0ByyJ6aWAK

delta 237
zcmcaGi|NBmrVYy83XCSjsX3|1B?`$|dU>U}#i>P^sRc!;nYlosI8jGoa)Phe<mY~}
z>|6?9FnOW32%NpuTYmCw@A}EvKC+Y7`>HcKPrmM}1Jofhxy4tB^D{_GVqOZ!43Wtj
zeAaAc_Uq+h6Anl$PR!aoJz_7P<=RvKcI{(eV9;X>WMoh+NGvW+Oi#@$$}bMfOw39w
ziZ?ViH#IUeF*PwYHZzE~FfuVRU}s=tWYC#h$SO1WLl*nyjp-q(Vj|cSmP}@}l$&hT
GD+T~&v`fzb

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml
index e96262495..79106579e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml
@@ -16,23 +16,24 @@
 	<parameter name="USUARIO" class="java.lang.Integer"/>
 	<parameter name="PASSAGEM_ABERTA" class="java.lang.String"/>
 	<queryString>
-		<![CDATA[select cj.numseriepreimpresa, cj.empresacorrida_id, em.nombempresa, es.cveestado,
-       cj.numfoliosistema,
-       cj.fechorventa, cj.feccorrida, cj.preciopagado
+		<![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,
        empresa em,
        punto_venta pv,
        parada pa,
        ciudad ci,
-       estado es
+       estado es,
+       marca ma
  where cj.activo = 1
-   and INSTR($P{LS_CATEGORIA}, '_' || cj.categoria_id || '_') > 0
-   and cj.empresacorrida_id = $P{EMPRESA_ID}
-   and cj.empresacorrida_id = em.empresa_id
+   and nvl(cj.empresacorrida_id, ma.empresa_id) = em.empresa_id
    and cj.puntoventa_id = pv.puntoventa_id
    and pv.parada_id = pa.parada_id
    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 INSTR($P{LS_CATEGORIA}, '_' || cj.categoria_id || '_') > 0
    and trunc(cj.fechorventa, 'DAY') between trunc($P{DATA_INICIO}, 'DAY') and trunc($P{DATA_FINAL}, 'DAY')
    and ((cj.feccorrida is null) or ($P{PASSAGEM_ABERTA} = 'T'))
  order by em.nombempresa, es.cveestado, cj.fechorventa]]>
@@ -108,7 +109,7 @@
 				<textElement>
 					<font size="12"/>
 				</textElement>
-				<text><![CDATA[Pasajeiros a Viajar]]></text>
+				<text><![CDATA[Passageiros a Viajar]]></text>
 			</staticText>
 			<textField>
 				<reportElement uuid="16e1afb9-2daf-47fd-bd15-f22e00d67c79" x="0" y="45" width="392" height="13"/>