From f19734bba798463459da9e923300b141600ac73a Mon Sep 17 00:00:00 2001
From: aristides <aristides@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 4 Dec 2018 13:33:55 +0000
Subject: [PATCH] fixes bug#12699 dev:Julio qua:Marcelo

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@87628 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../templates/RelatorioTrechoVendido.jasper   | Bin 41591 -> 41735 bytes
 .../templates/RelatorioTrechoVendido.jrxml    |  18 ++++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jasper
index 9a0e79d94f831bde168289b15920e7ae5e9dc6ae..65a9ce584c88e9affdf7b5247f43b16984f5b552 100644
GIT binary patch
delta 1222
zcma)*UuaWT9LIkrP0dM4ZCZ^@wsyU`&RYMJW}2oAI=J4P>UH-|IQO<Xk=<o!STky(
zwX<!~vbJMngRz(2QxS0+6CVUub~_O#Qih0#3^$x?qm1p%_dV=kAUla2aa3XV;cz+M
z@9&)7=X=ii>z1c{+p|O{0rb$H#5i+eo6k4t1puE*{HyJx9-H56#dD`ya9~%P`*PRl
zCgJ)d5hFe!Y{A)0e)o^Wy&$Q>E3eOZ>!Q(qceiE|kM~2I)mQ7SAzj*m`^_*8@b-v*
zVl<nVq5*$)>`YeLQ~Ak{NIL_5e9QQ#Q<9COl<7HHn8=+iWYYOeb}XIA74lAQM3Qo6
zr2KnhWBACJ{lCTpUND=yihM+Nm(5e2hV9Y;scTQPtGhdZLtN?jQwm7pd$Ox)Bso*{
z6la!d8p7G@F7m&9gj6uy%g67NYC1beV<iyx#)&VR$p$x_S4DR2<+Ga!3F69RSd70+
zZtdTD_wn_cBE%l@4uM@<fJ_v|a|L@mn;9((3+UWP!HLH9?d|Uyhz<0`_r;xPJl@-n
zy;BMvC^q53R1CFZINo|HJ)S<9oyd+mM`SC-xWie><Tin}n(}1I8CJPHBx~w%#_^k}
z4*Z}P#s^bd@m#STx0PDZHyy-l#h38a>DEYiUA1BwHalkHq3MtDVNu)ISaTTWQItxZ
z`1^DMlcmI#P)$n8w(O{es;H(rQ$la!S}&TZ$Qr}8xpJbxF!h71nygIW3W3J|kWg46
z(6SzZ!q@ouT<G93fd)$uJA*3Ik`{%l1U9eP2UU%UKrB-mW}Lz`0>L%KQn;G3HD*(|
zjz7%3u>S^u<~2=_8ceapF;lonAW&r(R1I09utH#C%~lD7!gm;)50hKiJ>L<zUF)@4
zW|`t9F$#AuJs)}hE`bfAC%e+jJpq~;GHi308I_EZ6uuY5Ple%FOy<gA3ik=riHs@y
zNFektn#pxpK+B44@;4|vsIlqtF-I}Q(i9%nW^JZNQkrZt5z)_rs<t<UU-A6Hi=kDK
z<WuKG;Wq-i@pOF~E|r4rqlHof`N|#n^jmM!Ygb8fg>2U^k)u18A&)&6CMi6G(WbYn
yil$$J$3l76En~U<IrhHAb#^Qxcke95o>%h9g=dvqbOWDtdP1RRJ{b9nzJCA!f_bU{

delta 1148
zcmZ`&U1%It6h3F0CO6wA*=DmQniMywn8csjNl2Ckl}u*urlT`+$C=5tro=JW#T2U>
zm#W#_Xrw;Gf(UZ*P<^ooQt%-ZZz+<N5F`|>RaA@=34$*^i4XeVgHXI_C#+~Y4`-Nj
zzH`3seD}`cmDpeFvGd3<PBFHj;&s-Cafywad)0?F)lR*oRyz1#m)zGolT@j9Mut@E
zK6)3uo@|uAj9g1#9W6gOAHxH3za=oX<4;<!HyhGvf5J}p(X#V4{VhglNf_#F){hB`
z2SOflXJf5a`muEH!&+~De>|-o-O17`PMX%ev4)NKxF;rDI_uvpv;Jm-($szQS5(w&
zst*%Vo4T|o68J(-D}6oNB?pRiY7LortqpNES#upK7UsH#wW~K)Rsmo?K9A7v6;4c_
zES8QJgHqwSnPR^1(y`;milH``$qWx1)H0bNZ7>`d%+TtbK{MqRN|c8>@0p!0O}|(;
zStx}bcZC;(fobz_QaGHxEbpVnN)J6-=}fiNa9KUj!<^~p7L_Zfo11DCM;xX%s*et)
zYN?xG(=iQGAhg%=5t$_n-Qox-I#5l~TBVInmzzkIJLtFaUhJf4l^LxxQmksxGu0ki
zsgB6q^Y7I)J)!$9_ae>o$(xIhB>t<P!7@Tyl+BqIS7={YdG0YdkJQZDM;UyI&>TSw
z;RO6hz~BNxytX8RiwMbWjHUa2XbC;LHRUtXPTh+u^wg>Lh0BV|^h0yp5grd+eOwt7
zn8IPOim*dD!(a_zTcoWY2@NsfD7MdQ*?`-wr3c(+u#T|nU*0jeg3uI+xMdoHFBHZR
z_L%DO7Pzl7xQfskf%2voOz4(5xh3?PLi$^Wn=`qURpY;@k@|*bx`Dd748BF!v%RQr
z9B$lN;CqC6<zKKh=?5jlRk}r<JL(#kSq48UQfD;Mp=5+U*FED9gX`*Cqj5Rm*}9_F
zjX-!$Gx$kaTpPn+6Y2L{M?Hg|5gwwKcXrX^^9lLtTh(3omHgw~OLZ-i7cskr_uJ?2
z@B<ehPnW3!bF@KPi+i(T+2`Pfs+^FirNy0hfUm#*KRBh9JemJs=uR#2!`rodEYF<1
PFP2Q+=I{FMqv3x5OHE$O

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jrxml
index 19d485eef..7d46f2808 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jrxml
@@ -2,7 +2,7 @@
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioTrechoVendido" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="41ab2d20-dc50-4e37-b78d-20e600a984d4">
 	<property name="ireport.zoom" value="1.5"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.y" value="118"/>
 	<parameter name="DATA_INICIO" class="java.sql.Timestamp"/>
 	<parameter name="DATA_FINAL" class="java.sql.Timestamp"/>
 	<parameter name="NOMBEMPRESA" class="java.lang.String">
@@ -19,22 +19,27 @@
     destino.DESCPARADA                AS DESTINO,
     TO_CHAR(cor.FECHORSALIDA ,'HH24:MI') AS FECHORSALIDA,
     e.NOMBEMPRESA                     AS NOMBEMPRESA,
-    SUM (c.PRECIOPAGADO)              AS SOMA,
+  SUM (CASE
+            WHEN c.motivocancelacion_id is null
+	then 1
+	else -1
+	end *
+	c.PRECIOPAGADO)              AS SOMA,
     COUNT(
         CASE
             WHEN c.PRECIOPAGADO = 0
-             OR c.PRECIOPAGADO IS NULL
+             OR c.PRECIOPAGADO IS NULL AND c.motivocancelacion_id  is null
             THEN 1
             ELSE NULL
         END) AS LIVRE,
     COUNT(
         CASE
-            WHEN c.PRECIOPAGADO <> 0
+            WHEN c.PRECIOPAGADO <> 0 AND c.motivocancelacion_id  is null
             THEN 1
             ELSE NULL
         END) AS VENDA
 FROM
-    BOLETO c
+    CAJA c
 LEFT JOIN PARADA origem
 ON
     (
@@ -66,8 +71,9 @@ WHERE
     c.FECHORVENTA BETWEEN $P{DATA_INICIO} AND $P{DATA_FINAL}
 
     AND ((c.PUNTOVENTA_ID IN ( $P!{PUNTOVENTA_ID} )) OR ($P{PUNTOVENTA_ID} = '-1'))
-    AND c.motivocancelacion_id is null
+
     AND e.NOMBEMPRESA LIKE $P{NOMBEMPRESA_SEARCH}
+    AND c.INDREIMPRESION = 0
 GROUP BY
     origem.DESCPARADA ,
     destino.DESCPARADA ,