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

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 ,