From e4d088d117bd061c4090565176ed10803e7b5c44 Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 5 Oct 2017 04:04:13 +0000
Subject: [PATCH] fixes bug #9386

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@74503 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/templates/RelatorioRDI.jasper  | Bin 126565 -> 126661 bytes
 .../relatorios/templates/RelatorioRDI.jrxml   |  48 +++++++++---------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jasper
index 61ed6ebe969bca2ae896d73127c8aced8379b8e6..fbdfb1d389c7f2e056975715b6ca948fec7af008 100644
GIT binary patch
delta 467
zcmaEQhyCbX_6=fRSqmBJnBPrie4;nG;0O2QfUmZ25zEcTzlJixxex_m-|gWdmXpta
ze+}nB<iGqtme2k98BKoHFL$_z<z(sKKjA!xe!oACa1qPNC;xnc^C0qH|2o4(EGHNJ
zLpOi^e<b}=r5NAARfF|UcVc8ja^UpcjErbOF#Q!1qbFRG<@8);#&2*g#EiKtjMi`=
z%jrU_j4$C_hze6SMkHrW-^9j<=FaK&*%^@>x;=`6QQcGA+|bP2*wE6*+$7%2(#*ib
jf}MepkwIs2A*;;vgfK?-?YjdRQ|1U_D4TBZj?okVVBfax

delta 449
zcmX?lm;LD-_6=fR*$N67>exR`KPbp(GCAa{EtEg`;0Ke<=f8$BqR1zGw?~qneE<7v
z6lsp1FzL;KKh;sSZu{kqtkwGWPZX_1e;kpeKmPfIBCYt(8CiPKzt1Srm;WQ{o*KmX
z4q1A79U~*mVIY4^|INsV;_vBt%#5B;9ork38MRQHKK&&NqcxK4)00>kU!s`b$;OE6
zyy;x*j41A#Zq31n?7;22I2hGE#SP6Z42(^UEzK?BjVz2z3{BY?7#SIKCKs~GOg|9D
V$i7`Vh%sf3AcnH(6W%eJ0sx6otPB7E

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jrxml
index 50c84f0bc..2dbd1767e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jrxml
@@ -138,10 +138,10 @@
 	<variable name="icmsRec_viagem" class="java.math.BigDecimal" resetType="Group" resetGroup="tiporecGroup">
 		<variableExpression><![CDATA[$V{icmsRec_rec}.subtract($V{icmsRec_dev})]]></variableExpression>
 	</variable>
-	<variable name="quant_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="quant_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{quant_rec}]]></variableExpression>
 	</variable>
-	<variable name="quant_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="quant_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{quant_dev}]]></variableExpression>
 	</variable>
 	<variable name="quant_mes" class="java.math.BigDecimal" resetType="None">
@@ -150,100 +150,100 @@
 	<variable name="uf" class="java.lang.String" resetType="Group" resetGroup="estadoGroup">
 		<variableExpression><![CDATA[$F{estado}]]></variableExpression>
 	</variable>
-	<variable name="tarifa_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="tarifa_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{tarifa_rec}]]></variableExpression>
 	</variable>
-	<variable name="tarifa_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="tarifa_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{tarifa_dev}]]></variableExpression>
 	</variable>
 	<variable name="tarifa_mes" class="java.math.BigDecimal" resetType="None">
 		<variableExpression><![CDATA[$V{tarifa_mes_rec}.subtract($V{tarifa_mes_dev})]]></variableExpression>
 	</variable>
-	<variable name="seguro_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="seguro_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{seguro_rec}]]></variableExpression>
 	</variable>
-	<variable name="seguro_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="seguro_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{seguro_dev}]]></variableExpression>
 	</variable>
 	<variable name="seguro_mes" class="java.math.BigDecimal" resetType="None">
 		<variableExpression><![CDATA[$V{seguro_mes_rec}.subtract($V{seguro_mes_dev})]]></variableExpression>
 	</variable>
-	<variable name="txEmbarque_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="txEmbarque_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{txEmbarque_rec}]]></variableExpression>
 	</variable>
-	<variable name="txEmbarque_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="txEmbarque_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{txEmbarque_dev}]]></variableExpression>
 	</variable>
 	<variable name="txEmbarque_mes" class="java.math.BigDecimal" resetType="None">
 		<variableExpression><![CDATA[$V{txEmbarque_mes_rec}.subtract($V{txEmbarque_mes_dev})]]></variableExpression>
 	</variable>
-	<variable name="pedagio_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="pedagio_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{pedagio_rec}]]></variableExpression>
 	</variable>
-	<variable name="pedagio_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="pedagio_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{pedagio_dev}]]></variableExpression>
 	</variable>
 	<variable name="pedagio_mes" class="java.math.BigDecimal" resetType="None">
 		<variableExpression><![CDATA[$V{pedagio_mes_rec}.subtract($V{pedagio_mes_dev})]]></variableExpression>
 	</variable>
-	<variable name="passagem_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="passagem_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{passagem_rec}]]></variableExpression>
 	</variable>
-	<variable name="passagem_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="passagem_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{passagem_dev}]]></variableExpression>
 	</variable>
 	<variable name="passagem_mes" class="java.math.BigDecimal" resetType="None">
 		<variableExpression><![CDATA[$V{passagem_mes_rec}.subtract($V{passagem_mes_dev})]]></variableExpression>
 	</variable>
-	<variable name="isentos_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="isentos_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{isentos_rec}]]></variableExpression>
 	</variable>
-	<variable name="isentos_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="isentos_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{isentos_dev}]]></variableExpression>
 	</variable>
 	<variable name="isentos_mes" class="java.math.BigDecimal" resetType="None">
 		<variableExpression><![CDATA[$V{isentos_mes_rec}.subtract($V{isentos_mes_dev})]]></variableExpression>
 	</variable>
-	<variable name="outros_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="outros_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{outros_rec}]]></variableExpression>
 	</variable>
-	<variable name="outros_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="outros_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{outros_dev}]]></variableExpression>
 	</variable>
 	<variable name="outros_mes" class="java.math.BigDecimal" resetType="None">
 		<variableExpression><![CDATA[$V{outros_mes_rec}.subtract($V{outros_mes_dev})]]></variableExpression>
 	</variable>
-	<variable name="baseCalculo_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="baseCalculo_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{baseCalculo_rec}]]></variableExpression>
 	</variable>
-	<variable name="baseCalculo_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="baseCalculo_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{baseCalculo_dev}]]></variableExpression>
 	</variable>
 	<variable name="baseCalculo_mes" class="java.math.BigDecimal" resetType="None">
 		<variableExpression><![CDATA[$V{baseCalculo_mes_rec}.subtract($V{baseCalculo_mes_dev})]]></variableExpression>
 	</variable>
-	<variable name="icms_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="icms_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{icms_rec}]]></variableExpression>
 	</variable>
-	<variable name="icms_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="icms_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{icms_dev}]]></variableExpression>
 	</variable>
 	<variable name="icms_mes" class="java.math.BigDecimal" resetType="None">
 		<variableExpression><![CDATA[$V{icms_mes_rec}.subtract($V{icms_mes_dev})]]></variableExpression>
 	</variable>
-	<variable name="credPres_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="credPres_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{credPres_rec}]]></variableExpression>
 	</variable>
-	<variable name="credPres_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="credPres_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{credPres_dev}]]></variableExpression>
 	</variable>
 	<variable name="credPres_mes" class="java.math.BigDecimal" resetType="None">
 		<variableExpression><![CDATA[$V{credPres_mes_rec}.subtract($V{credPres_mes_dev})]]></variableExpression>
 	</variable>
-	<variable name="icmsRec_mes_rec" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="icmsRec_mes_rec" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{icmsRec_rec}]]></variableExpression>
 	</variable>
-	<variable name="icmsRec_mes_dev" class="java.math.BigDecimal" resetType="Column" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
+	<variable name="icmsRec_mes_dev" class="java.math.BigDecimal" resetType="Group" resetGroup="estadoGroup" incrementType="Group" incrementGroup="tiporecGroup" calculation="Sum">
 		<variableExpression><![CDATA[$V{icmsRec_dev}]]></variableExpression>
 	</variable>
 	<variable name="icmsRec_mes" class="java.math.BigDecimal" resetType="None">