diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jasper
index 61ed6ebe9..fbdfb1d38 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jasper differ
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">