diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesDevolvidos.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesDevolvidos.jrxml
new file mode 100644
index 000000000..9eec428c6
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesDevolvidos.jrxml
@@ -0,0 +1,1000 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 18 THEN
+ 1
+ ELSE
+ 0
+ END) TOTAL_BILHETES,
+
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IS NOT NULL THEN
+ 1
+ ELSE
+ 0
+ END) TOTAL_BILHETES_CANC,
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IS NULL AND
+ CJ.TIPOVENTA_ID = 18 THEN
+ 1
+ ELSE
+ 0
+ END) TOTAL_BILHETES_GAP,
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IS NULL AND
+ CJ.TIPOVENTA_ID <> 18 THEN
+ CJ.PRECIOPAGADO
+ ELSE
+ 0
+ END) RECEITA_TARIFA,
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IS NULL AND
+ CJ.TIPOVENTA_ID = 18 THEN
+ CJ.PRECIOPAGADO
+ ELSE
+ 0
+ END) RECEITA_TARIFA_GAP,
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IS NULL AND
+ CJ.TIPOVENTA_ID <> 18 THEN
+ CJ.IMPORTESEGURO
+ ELSE
+ 0
+ END) RECEITA_SEGURO,
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IS NULL AND
+ CJ.TIPOVENTA_ID = 18 THEN
+ CJ.IMPORTESEGURO
+ ELSE
+ 0
+ END) RECEITA_SEGURO_GAP,
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IS NULL AND
+ CJ.TIPOVENTA_ID <> 18 THEN
+ CJ.IMPORTETAXAEMBARQUE
+ ELSE
+ 0
+ END) RECEITA_EMBARQUE,
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IS NULL AND
+ CJ.TIPOVENTA_ID = 18 THEN
+ CJ.IMPORTETAXAEMBARQUE
+ ELSE
+ 0
+ END) RECEITA_EMBARQUE_GAP,
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IS NULL AND
+ CJ.TIPOVENTA_ID <> 18 THEN
+ CJ.IMPORTEOUTROS
+ ELSE
+ 0
+ END) RECEITA_OUTROS,
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IS NULL AND
+ CJ.TIPOVENTA_ID = 18 THEN
+ CJ.IMPORTEOUTROS
+ ELSE
+ 0
+ END) RECEITA_OUTROS_GAP,
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IS NULL AND
+ CJ.TIPOVENTA_ID <> 18 THEN
+ CJ.IMPORTEPEDAGIO
+ ELSE
+ 0
+ END) RECEITA_PEDAGIO,
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IS NULL AND
+ CJ.TIPOVENTA_ID = 18 THEN
+ CJ.IMPORTEPEDAGIO
+ ELSE
+ 0
+ END) RECEITA_PEDAGIO_GAP,
+
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IN (31, 32) AND
+ CJ.TIPOVENTA_ID <> 18 THEN
+ CJ.PRECIOPAGADO
+ ELSE
+ 0
+ END) TOTAL_DEVOL,
+ SUM(CASE
+ WHEN CJ.MOTIVOCANCELACION_ID IN (31, 32) AND
+ CJ.TIPOVENTA_ID = 18 THEN
+ CJ.PRECIOPAGADO
+ ELSE
+ 0
+ END) TOTAL_DEVOL_GAP
+ FROM CAJA CJ,
+ PUNTO_VENTA PV,
+ EMPRESA EM,
+ PARADA PR,
+ CIUDAD CD,
+ CIUDAD CE,
+ ESTADO ES
+ WHERE CJ.PUNTOVENTA_ID = PV.PUNTOVENTA_ID
+ AND TRUNC(CJ.FECHORVENTA) BETWEEN TO_DATE( '01/04/2013' , 'DD/MM/YYYY') AND
+ TO_DATE( '30/04/2013' , 'DD/MM/YYYY')
+ AND PR.PARADA_ID = PV.PARADA_ID
+ AND CJ.EMPRESAPUNTOVENTA_ID = EM.EMPRESA_ID
+ AND EM.CIUDAD_ID = CE.CIUDAD_ID
+ AND CD.CIUDAD_ID = PR.CIUDAD_ID
+ AND CD.ESTADO_ID = ES.ESTADO_ID
+ AND ((INSTR( ',0800060001,',
+ ',' || TRIM(NUMPUNTOVENTA) || ',') > 0 AND
+ 'N' = 'N') OR
+ ( 'N' = 'S'))
+ GROUP BY ES.CVEESTADO,
+ PV.PUNTOVENTA_ID,
+ PV.NUMPUNTOVENTA,
+ CJ.EMPRESAPUNTOVENTA_ID,
+ CE.ESTADO_ID,
+ PV.NOMBPUNTOVENTA) TAB,
+ VTABOL.EVENTO_EXTRA EE
+ WHERE TRUNC(EE.FECHORINGRESO(+)) BETWEEN TO_DATE( '01/04/2013' , 'DD/MM/YYYY') AND
+ TO_DATE( '30/04/2013' , 'DD/MM/YYYY')
+ AND EE.PUNTOVENTA_ID(+) = TAB.PUNTOVENTA_ID
+ GROUP BY TAB.CVEESTADO,
+ TAB.PUNTOVENTA_ID,
+ TAB.NUMPUNTOVENTA,
+ TAB.NOMBPUNTOVENTA,
+ TAB.TOTAL_BILHETES,
+ TAB.TOTAL_BILHETES_GAP,
+ TAB.RECEITA_TARIFA,
+ TAB.RECEITA_SEGURO,
+ TAB.TOTAL_DEVOL,
+ TAB.RECEITA_TARIFA_GAP,
+ TAB.RECEITA_SEGURO_GAP,
+ TAB.TOTAL_DEVOL_GAP,
+ TAB.EMPRESAPUNTOVENTA_ID,
+ TAB.ESTADO_ID,
+ TAB.TOTAL_BILHETES_CANC) TAB1]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml
new file mode 100644
index 000000000..290e992d4
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml
@@ -0,0 +1,292 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetesGap.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetesGap.jrxml
new file mode 100644
index 000000000..a4c677abf
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetesGap.jrxml
@@ -0,0 +1,282 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper
index 49404dddc..7c9bcd294 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml
index 54247a48c..b21dea335 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml
@@ -1,7 +1,7 @@
-
+