From 70d298a83fada4b1246a6df74b3173cadae08a0c Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 12 Sep 2018 16:21:25 +0000
Subject: [PATCH] bug#11600 dev: julio qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@85272 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioDevolucaoBilhetes.java      |  92 ++++---
 .../relatorios/templates/RelatorioRDI.jasper  | Bin 126661 -> 126661 bytes
 .../relatorios/templates/RelatorioRDI.jrxml   | 234 +++++++++---------
 3 files changed, 162 insertions(+), 164 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
index 6085979a9..a21f239e4 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
@@ -169,6 +169,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 
 						BigDecimal valorContabil = BigDecimal.ZERO;
 						BigDecimal baseCalculoICMS = BigDecimal.ZERO;
+						BigDecimal valorIsenta = BigDecimal.ZERO;
 
 						ExportacaoBPEVo exportacaoBPEVo = new ExportacaoBPEVo();
 						TBPe tbpe = null;
@@ -184,8 +185,6 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 						String vICMS = null;
 						String pRedBC = null;
 
-						String vIsenta = null;
-
 						if (StringUtils.isNotBlank(xml)) {
 							if (tbpe.getInfBPe().getImp().getICMS().getICMS00() != null) {
 								vBC = tbpe.getInfBPe().getImp().getICMS().getICMS00().getVBC();
@@ -198,32 +197,27 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 								pRedBC = tbpe.getInfBPe().getImp().getICMS().getICMS20().getPRedBC();
 							}
 
-							valorContabil = new BigDecimal(vBC == null ? "0.0" : vBC);
-
 							if (tbpe.getInfBPe().getInfValorBPe() != null) {
-								for (TBPe.InfBPe.InfValorBPe.Comp comp : tbpe.getInfBPe().getInfValorBPe().getComp()) {
 
+								String vPgto = tbpe.getInfBPe().getInfValorBPe().getVPgto();
+								valorContabil = new BigDecimal(vPgto == null ? "0.0" : vPgto);
+
+								for (TBPe.InfBPe.InfValorBPe.Comp comp : tbpe.getInfBPe().getInfValorBPe().getComp()) {
 									if (comp.getTpComp().equals(TipoComp.PEDAGIO)) {
-										baseCalculoICMS = baseCalculoICMS.add(isEstadual && db.getIndPedadioEstdual() ? new BigDecimal(comp.getVComp() == null ? "0.0" : comp.getVComp()) : BigDecimal.ZERO);
-										baseCalculoICMS = baseCalculoICMS.add(!isEstadual && db.getIndPedagioMunicipal() ? new BigDecimal(comp.getVComp() == null ? "0.0" : comp.getVComp()) : BigDecimal.ZERO);
+										valorIsenta = valorIsenta.add(isEstadual && !db.getIndPedadioEstdual() ? new BigDecimal(comp.getVComp() == null ? "0.0" : comp.getVComp()) : BigDecimal.ZERO);
+										valorIsenta = valorIsenta.add(!isEstadual && !db.getIndPedagioMunicipal() ? new BigDecimal(comp.getVComp() == null ? "0.0" : comp.getVComp()) : BigDecimal.ZERO);
 									}
 
 									if (comp.getTpComp().equals(TipoComp.TAXA_EMBARQUE)) {
-										baseCalculoICMS = baseCalculoICMS.add(isEstadual && db.getIndTxEmbarqueEstadual() ? new BigDecimal(comp.getVComp() == null ? "0.0" : comp.getVComp()) : BigDecimal.ZERO);
-										baseCalculoICMS = baseCalculoICMS.add(!isEstadual && db.getIndTxEmbarqueMunicipal() ? new BigDecimal(comp.getVComp() == null ? "0.0" : comp.getVComp()) : BigDecimal.ZERO);
+										valorIsenta = valorIsenta.add(isEstadual && !db.getIndTxEmbarqueEstadual() ? new BigDecimal(comp.getVComp() == null ? "0.0" : comp.getVComp()) : BigDecimal.ZERO);
+										valorIsenta = valorIsenta.add(!isEstadual && !db.getIndTxEmbarqueMunicipal() ? new BigDecimal(comp.getVComp() == null ? "0.0" : comp.getVComp()) : BigDecimal.ZERO);
 									}
 
 									if (comp.getTpComp().equals(TipoComp.SEGURO)) {
-										baseCalculoICMS = baseCalculoICMS.add(isEstadual && db.getIndSeguroEstadual() ? new BigDecimal(comp.getVComp() == null ? "0.0" : comp.getVComp()) : BigDecimal.ZERO);
-										baseCalculoICMS = baseCalculoICMS.add(!isEstadual && db.getIndSeguroMunicipal() ? new BigDecimal(comp.getVComp() == null ? "0.0" : comp.getVComp()) : BigDecimal.ZERO);
-									}
-
-									if (!comp.getTpComp().equals("01")) {
-										vIsenta = comp.getVComp();
-										valorContabil = valorContabil.add(new BigDecimal(comp.getVComp() == null ? "0.0" : comp.getVComp()));
+										valorIsenta = valorIsenta.add(isEstadual && !db.getIndSeguroEstadual() ? new BigDecimal(comp.getVComp() == null ? "0.0" : comp.getVComp()) : BigDecimal.ZERO);
+										valorIsenta = valorIsenta.add(!isEstadual && !db.getIndSeguroMunicipal() ? new BigDecimal(comp.getVComp() == null ? "0.0" : comp.getVComp()) : BigDecimal.ZERO);
 									}
 								}
-
 							}
 						}
 
@@ -238,9 +232,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 						db.setValorIcms(valorIcms);
 						BigDecimal outras = new BigDecimal(pRedBC == null ? "0.0" : pRedBC);
 						db.setValorOutras(outras);
-
-						db.setValorIsenta(StringUtils.isNotBlank(xml) && db.getTotalBilhete().floatValue() > 0 ? new BigDecimal(vIsenta == null ? "0.0" : vIsenta) : BigDecimal.ZERO);
-
+						db.setValorIsenta(valorIsenta);
 						db.setEstornoEstadual(BigDecimal.ZERO);
 						db.setEstornoMunicipal(BigDecimal.ZERO);
 
@@ -255,42 +247,48 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 						boolean isEstadual = rset.getInt("IS_ESTADUAL") == 1;
 						db.setEstadual(isEstadual);
 
+						BigDecimal valorIsenta = BigDecimal.ZERO;
 						BigDecimal valorContabil = BigDecimal.ZERO;
 						if (isEstadual) {
+							valorContabil = valorContabil.add(db.getIndTarifaEstadual() ? db.getPrecioPagado() : BigDecimal.ZERO);
 							valorContabil = valorContabil.add(db.getIndPedadioEstdual() ? db.getImportepedagio() : BigDecimal.ZERO);
 							valorContabil = valorContabil.add(db.getIndSeguroEstadual() ? db.getImporteseguro() : BigDecimal.ZERO);
-							valorContabil = valorContabil.add(db.getIndTarifaEstadual() ? db.getPrecioPagado() : BigDecimal.ZERO);
 							valorContabil = valorContabil.add(db.getIndTxEmbarqueEstadual() ? db.getImportetaxaembarque() : BigDecimal.ZERO);
+
+							valorIsenta = valorIsenta.add(!db.getIndPedadioEstdual() ? db.getImportepedagio() : BigDecimal.ZERO);
+							valorIsenta = valorIsenta.add(!db.getIndSeguroEstadual() ? db.getImporteseguro() : BigDecimal.ZERO);
+							valorIsenta = valorIsenta.add(!db.getIndTxEmbarqueEstadual() ? db.getImportetaxaembarque() : BigDecimal.ZERO);
 						} else {
+							valorContabil = valorContabil.add(db.getIndTarifaMunicipal() ? db.getPrecioPagado() : BigDecimal.ZERO);
 							valorContabil = valorContabil.add(db.getIndPedagioMunicipal() ? db.getImportepedagio() : BigDecimal.ZERO);
 							valorContabil = valorContabil.add(db.getIndSeguroMunicipal() ? db.getImporteseguro() : BigDecimal.ZERO);
-							valorContabil = valorContabil.add(db.getIndTarifaMunicipal() ? db.getPrecioPagado() : BigDecimal.ZERO);
 							valorContabil = valorContabil.add(db.getIndTxEmbarqueMunicipal() ? db.getImportetaxaembarque() : BigDecimal.ZERO);
+
+							valorIsenta = valorIsenta.add(!db.getIndPedagioMunicipal() ? db.getImportepedagio() : BigDecimal.ZERO);
+							valorIsenta = valorIsenta.add(!db.getIndSeguroMunicipal() ? db.getImporteseguro() : BigDecimal.ZERO);
+							valorIsenta = valorIsenta.add(!db.getIndTxEmbarqueMunicipal() ? db.getImportetaxaembarque() : BigDecimal.ZERO);
 						}
 						db.setValorContabil(valorContabil);
+						db.setValorIsenta(valorIsenta);
 
 						BigDecimal baseCalculoIcms = BigDecimal.ZERO;
 						BigDecimal valorIcms = BigDecimal.ZERO;
-						if (db.isIsenta()) {
-							db.setValorIsenta(valorContabil);
+
+						BigDecimal redBaseCalcIcms = BigDecimal.ZERO;
+
+						redBaseCalcIcms = db.getPorcredbaseicms() == null ? BigDecimal.ZERO : db.getPorcredbaseicms().divide(UtiliteriasFiscal.CEM);
+
+						BigDecimal redutor = valorContabil.multiply(redBaseCalcIcms);
+						baseCalculoIcms = valorContabil.subtract(redutor);
+
+						BigDecimal aliquota = BigDecimal.ZERO;
+						if (isEstadual) {
+							aliquota = db.getTributacaoimportacao() == null ? db.getIcmsInterestadual() : db.getTributacaoimportacao();
 						} else {
-
-							BigDecimal redBaseCalcIcms = BigDecimal.ZERO;
-
-							redBaseCalcIcms = db.getPorcredbaseicms() == null ? BigDecimal.ZERO : db.getPorcredbaseicms().divide(UtiliteriasFiscal.CEM);
-
-							BigDecimal redutor = valorContabil.multiply(redBaseCalcIcms);
-							baseCalculoIcms = valorContabil.subtract(redutor);
-
-							BigDecimal aliquota = BigDecimal.ZERO;
-							if (isEstadual) {
-								aliquota = db.getTributacaoimportacao() == null ? db.getIcmsInterestadual() : db.getTributacaoimportacao();
-							} else {
-								aliquota = db.getTributacaoimportacao() == null ? db.getIcmsIntermunicipal() : db.getTributacaoimportacao();
-							}
-							valorIcms = baseCalculoIcms.multiply(aliquota.divide(UtiliteriasFiscal.CEM));
-							db.setValorIcms(valorIcms);
+							aliquota = db.getTributacaoimportacao() == null ? db.getIcmsIntermunicipal() : db.getTributacaoimportacao();
 						}
+						valorIcms = baseCalculoIcms.multiply(aliquota.divide(UtiliteriasFiscal.CEM));
+						db.setValorIcms(valorIcms);
 
 						db.setBaseCalculoIcms(baseCalculoIcms);
 						db.setEstornoEstadual(BigDecimal.ZERO);
@@ -304,9 +302,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 					}
 
 					lsDev.add(db);
-
 				}
-
 				setLsDadosRelatorio(lsDev);
 			}
 		});
@@ -452,21 +448,23 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 		sql.append("  DBMS_LOB.SUBSTR((CASE WHEN BPEORI.TIPOEVENTO IS NOT NULL THEN BPEANT.XMLREGULAR ELSE BPEORI.XMLREGULAR END), 3000, 3001) AS XML_BPE_2, ");
 		sql.append("  DBMS_LOB.SUBSTR((CASE WHEN BPEORI.TIPOEVENTO IS NOT NULL THEN BPEANT.XMLREGULAR ELSE BPEORI.XMLREGULAR END), 3000, 6001) AS XML_BPE_3 ");
 		sql.append("FROM BOLETO BORI ");
-		sql.append("  INNER JOIN MARCA M ON M.MARCA_ID = BORI.MARCA_ID AND M.ACTIVO = 1 "); 
+		sql.append("  INNER JOIN MARCA M ON M.MARCA_ID = BORI.MARCA_ID AND M.ACTIVO = 1 ");
 		sql.append("  INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ");
 		sql.append("  INNER JOIN BPE BPE ON BPE.BOLETO_ID = BORI.BOLETO_ID ");
 		sql.append("  INNER JOIN ESTADO EST_BPE ON BPE.UF = EST_BPE.CODIBGE ");
-		sql.append("  LEFT JOIN BOLETO B ON B.BOLETO_ID = BORI.BOLETOORIGINAL_ID "); 
+//		sql.append("  LEFT JOIN BOLETO B ON B.BOLETO_ID = BORI.BOLETOORIGINAL_ID ");
+		sql.append("  LEFT JOIN BOLETO B ON B.BOLETO_ID = (CASE WHEN BORI.MOTIVOCANCELACION_ID = 99 THEN  BORI.BOLETOANTERIOR_ID ELSE BORI.BOLETOORIGINAL_ID END) ");
+		
 		sql.append("  LEFT JOIN BPE BPEORI ON B.BOLETO_ID = BPEORI.BOLETO_ID ");
-		sql.append("  INNER JOIN PUNTO_VENTA PTV ON PTV.PUNTOVENTA_ID = BORI.PUNTOVENTA_ID "); 
+		sql.append("  INNER JOIN PUNTO_VENTA PTV ON PTV.PUNTOVENTA_ID = BORI.PUNTOVENTA_ID ");
 		sql.append("  INNER JOIN PARADA ORI ON (B.ORIGEN_ID = ORI.PARADA_ID ) ");
 		sql.append("  INNER JOIN PARADA DES ON (B.DESTINO_ID = DES.PARADA_ID ) ");
 		sql.append("  INNER JOIN CIUDAD CO ON (CO.CIUDAD_ID = ORI.CIUDAD_ID ) ");
 		sql.append("  INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DES.CIUDAD_ID ) ");
 		sql.append("  INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID ");
 		sql.append("LEFT JOIN ALIAS_SERVICO S ON S.ORIGEN_ID = B.ORIGEN_ID ");
-		sql.append("                 		  AND S.DESTINO_ID = B.DESTINO_ID AND (S.CORRIDA_ID = B.CORRIDA_ID OR S.CORRIDA_ID IS NULL) "); 
-		sql.append("                 		  AND S.RUTA_ID = B.RUTA_ID AND S.ACTIVO = 1 "); 
+		sql.append("                 		  AND S.DESTINO_ID = B.DESTINO_ID AND (S.CORRIDA_ID = B.CORRIDA_ID OR S.CORRIDA_ID IS NULL) ");
+		sql.append("                 		  AND S.RUTA_ID = B.RUTA_ID AND S.ACTIVO = 1 ");
 		sql.append("LEFT JOIN PARADA POS ON POS.PARADA_ID = S.ALIASORIGEN_ID ");
 		sql.append("LEFT JOIN CIUDAD COS ON COS.CIUDAD_ID = POS.CIUDAD_ID ");
 		sql.append("LEFT JOIN ESTADO EOS ON EOS.ESTADO_ID = COS.ESTADO_ID ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jasper
index fbdfb1d389c7f2e056975715b6ca948fec7af008..4937796c14df2131c544611678f7885b1d7aed1a 100644
GIT binary patch
delta 3329
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
Tb<yKn;5Bvpd)&EekXZi(!8p4+

delta 3263
zcmc(gX-rgC6oB7l9487&6x=dclcLmNQHBA=g~e^=;f%GSMnoglxHnQ!(w5dL(Zp)2
zRpC@8)>Oqxp`w5eFtliE`-UbB>$o)f!zDE-sdej;G_8&8x$mBL1J(X6KVIH<&bjxV
zcfL1|)*F`A8<zU^IOg<s#BFA*3_{5pp>BK-3VsTQ$dm;0bBe;wKq$@z>r&h>Dn1CC
z9cktmjJD~~_2X68o1j6lEuHn~k;^tW{FxYp(g%@nFFwI+Rg|y<J>yDn!}<w9cq!3o
zo`q4j9=+;N;o3wEZl%VQCyX$U#l&tsQ8rP9>2?i{B-_m?7(J~=8xmEhOVQwqB(cd&
zJsLYfg_u+gk|vJvKTdr-+U&#*mq1yX%|CX5m*MjjEi7Ra-M-f5AHGOs`eT&oMSJo*
z2CkT7^PBP|^5QK^+>9o{cYL^Xwt>8O%`%C+_(s8OhNIwx^Io3MZ+TJs3jLNB<gCQa
zXW#?n=tUP-VJ8B4VcHr4{oB`WVD#jCH|u(@fxPg8S0wUX2W`N0e5yC~U3V1XAv*d)
zuNE5_Ubwj^kVJ#%K5X;n9mRH?{)%I-8{^5XvH4vUE@K{81Y19M!;=#s=vQl}q1EoR
zLGuX}UOTDza-!K#c)Ko<Qn(%_oK&HwQiDmAQ)qB}n_pYpu(T@Z+cu01fx#Ds!K2k9
zD9!gfUa3MywZ_vC@J5}TQhdK*RVt{bG#FEzi38<(y;H5iS2Y?O_|%ONTwZ=k1?L$a
z7y{OsGz{j}6v3%l&DRpf27%+Cou<rJKRT_#=z0wb>jvr%CFakYSXqlN^jV&nO7;Bw
z@9I=A`8Bv*?<6C97uQ)gyxD*+^to(`@*U2fbHlwx9vzHNk;YDABQ|g}sIW4iL1yDr
z(!_W8q)~<I%^K7<Wl@yx5ED?tvo<N)`s<erDEm4}+-AX$CV9(RqEbXvQ85-P`HG?~
zEW$szGK-U*TWZ8J!0t$b;+EkszBz-A<n5I=tKoC_LjB^=j})vQNw@q+ar=xTDe=^i
z9{tE4&qw>ZEo=Z(ezq%OaS`uT!SmQ5f9!>s5%fYn3F3SG?HuFPLxdkf9$4HKgx@Y@
z()+-p%P)K2YI_h0uZ%0Nu%c@o9NgvsZ)Xr<+NYB`9^KRKf!3}dKimvQJJQG$Pq9vK
z_&99BqF-Vm)D^W#uz0+=y(TJZ#)(AUe<gZ5Fjo9~AeLBtAh$0?Lu8ksowu{4%Ny?C
z?dTV~-j3jBw9`A$r=8x3KJ8HAsdnsoJNZ|lA$zSE_I2-L*)Td(GJHlaNhRW5Q6eGf
zLZ<)vm6CNrnQvM;vjs{sStdynfxB7k!!Y4X1kO!o*^IRbu+GGC)+1oYEX;`i5+d->
z#ioi6mRkfCt86keKabzG_e9{!95#hMg(C2RhfSkzoCqBBGH?Hp$xeH^(_x>S;!Ith
zJ~=%(b&^G4Oi6@I<{00_Ma&Yg&S$$8mhNma6<jned$B6)P<#X1C22R(yOQ2Q+9PQL
z()*GMkoHTOhg2qM1`<e0MLH-c4#`(4aU|klNdu9N7{vZU`bg3Pq+^n9BUMPcg!Hkb
zAX25ICZsA!)h(vN{CMB-Dz@K~Eu#al#$}N57|AQ?K2olvTS$45LP*Pye7Sd6UZA_0
z{bDXvdYVl6Vzyi38<f8#ZNy?GX$9u)NLqmOvm_T*nj|?f_lG1K((jV2NcSZTiZZqO
zM%`s21Nn8VF`8TM>|>dTEEADsBC<?GmWjwR5m_c8%S47{Lb6OmmIWD>iO4b$StcUO
zL}ZzWEEAFCh*n{lqGVZ+VVQ_56Om;ivfL>wXMAH=?&xEgh%6J4Wg@anM3#xjG7(uO
zBFjYFa^Orm>(B*X>m!(m1QU^9A`(nQf{92l5eX(D!9<2&LJ~|wf(03ZiAXRJ2__=J
zL?oDq1QU_qlJD7m6@SJQCBcFW!9*mOhy)Yqf&+8!usQwz@1Jh~f4-~x4So7M?mO^+
GrTqhwqm)np

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jrxml
index 2dbd1767e..4f44da2f2 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRDI.jrxml
@@ -512,147 +512,133 @@
 					<textFieldExpression><![CDATA[$V{pedagio_mes}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="346" y="0" width="55" height="13" uuid="8ba673dc-62ca-4e6c-aaf0-c52929fb79c9"/>
+					<reportElement x="346" y="0" width="68" height="13" uuid="8ba673dc-62ca-4e6c-aaf0-c52929fb79c9"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{passagem_mes_rec}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="346" y="13" width="55" height="13" uuid="3b907e14-ebc2-4c5b-8cde-fade7ad52501"/>
+					<reportElement x="346" y="13" width="68" height="13" uuid="3b907e14-ebc2-4c5b-8cde-fade7ad52501"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{passagem_mes_dev}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="346" y="26" width="55" height="13" uuid="42a8d3c4-c1ac-49a5-8baf-74dd41221353"/>
+					<reportElement x="346" y="26" width="68" height="13" uuid="42a8d3c4-c1ac-49a5-8baf-74dd41221353"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{passagem_mes}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="401" y="0" width="28" height="13" uuid="33f8c648-d177-406c-9bf1-067a0d1efa03"/>
-					<textElement textAlignment="Right">
-						<font size="7"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$V{isentos_mes_rec}]]></textFieldExpression>
-				</textField>
-				<textField pattern="#,##0.00">
-					<reportElement x="401" y="13" width="28" height="13" uuid="dc4ddbb7-ccca-42ae-8339-9ce1a860e612"/>
+					<reportElement x="582" y="12" width="44" height="13" uuid="dc4ddbb7-ccca-42ae-8339-9ce1a860e612"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{isentos_mes_dev}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="401" y="26" width="28" height="13" uuid="da748bf7-5922-4672-b991-5ca680e33637"/>
+					<reportElement x="582" y="25" width="44" height="13" uuid="da748bf7-5922-4672-b991-5ca680e33637"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{isentos_mes}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="429" y="0" width="30" height="13" uuid="69178813-36ee-4d02-b73e-9587d571c7fa"/>
-					<textElement textAlignment="Right">
-						<font size="7"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$V{outros_mes_rec}]]></textFieldExpression>
-				</textField>
-				<textField pattern="#,##0.00">
-					<reportElement x="429" y="13" width="30" height="13" uuid="f9d972c2-4e51-4413-9d3c-4ac96b575865"/>
+					<reportElement x="626" y="13" width="43" height="13" uuid="f9d972c2-4e51-4413-9d3c-4ac96b575865"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{outros_mes_dev}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="429" y="26" width="30" height="13" uuid="1a3a210e-1424-497d-ad40-36a58da7e3eb"/>
+					<reportElement x="626" y="26" width="43" height="13" uuid="1a3a210e-1424-497d-ad40-36a58da7e3eb"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{outros_mes}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="487" y="0" width="68" height="13" uuid="5b71c868-6e09-4c3b-8231-3e6ec5fd6ce6"/>
+					<reportElement x="442" y="0" width="68" height="13" uuid="5b71c868-6e09-4c3b-8231-3e6ec5fd6ce6"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{baseCalculo_mes_rec}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="487" y="13" width="68" height="13" uuid="af32633b-b76c-43e9-a032-8f1bf3ea280e"/>
+					<reportElement x="442" y="13" width="68" height="13" uuid="af32633b-b76c-43e9-a032-8f1bf3ea280e"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{baseCalculo_mes_dev}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="487" y="26" width="68" height="13" uuid="da646b3a-7d40-4f58-bf0b-056abc2cd189"/>
+					<reportElement x="442" y="26" width="68" height="13" uuid="da646b3a-7d40-4f58-bf0b-056abc2cd189"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{baseCalculo_mes}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="584" y="0" width="66" height="13" uuid="91d61e28-e4dc-46f4-9c2c-4959b08d04fc"/>
+					<reportElement x="532" y="0" width="50" height="13" uuid="91d61e28-e4dc-46f4-9c2c-4959b08d04fc"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{icms_mes_rec}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="584" y="13" width="66" height="13" uuid="6e8ebad2-c02b-4dc9-89ce-3b2d23b94433"/>
+					<reportElement x="532" y="13" width="50" height="13" uuid="6e8ebad2-c02b-4dc9-89ce-3b2d23b94433"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{icms_mes_dev}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="584" y="26" width="66" height="13" uuid="e8fe1d17-a0db-411c-8710-177abb918412"/>
+					<reportElement x="532" y="26" width="50" height="13" uuid="e8fe1d17-a0db-411c-8710-177abb918412"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{icms_mes}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="684" y="0" width="50" height="13" uuid="f84d15c6-0f94-4b31-ab70-2a6f61f690a2"/>
+					<reportElement x="699" y="0" width="48" height="13" uuid="f84d15c6-0f94-4b31-ab70-2a6f61f690a2"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{credPres_mes_rec}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="684" y="13" width="50" height="13" uuid="233051e3-71ee-4e9b-95ef-0d88836af2b2"/>
+					<reportElement x="699" y="13" width="48" height="13" uuid="233051e3-71ee-4e9b-95ef-0d88836af2b2"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{credPres_mes_dev}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="684" y="26" width="50" height="13" uuid="74db31a5-ff79-4d38-8324-8329939a0861"/>
+					<reportElement x="699" y="26" width="48" height="13" uuid="74db31a5-ff79-4d38-8324-8329939a0861"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{credPres_mes}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="734" y="0" width="68" height="13" uuid="7590d9f7-e31f-46bd-a13a-7372f160bb5e"/>
+					<reportElement x="747" y="0" width="55" height="13" uuid="7590d9f7-e31f-46bd-a13a-7372f160bb5e"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{icmsRec_mes_rec}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="734" y="13" width="68" height="13" uuid="238531f8-71ef-4fc8-b661-b180fc61728b"/>
+					<reportElement x="747" y="13" width="55" height="13" uuid="238531f8-71ef-4fc8-b661-b180fc61728b"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{icmsRec_mes_dev}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="734" y="26" width="68" height="13" uuid="67622ae9-b10b-4b45-b86f-7e6b898c680d"/>
+					<reportElement x="747" y="26" width="55" height="13" uuid="67622ae9-b10b-4b45-b86f-7e6b898c680d"/>
 					<textElement textAlignment="Right">
 						<font size="7"/>
 					</textElement>
@@ -661,6 +647,20 @@
 				<line>
 					<reportElement x="0" y="39" width="802" height="1" uuid="628eada5-615f-462a-8230-6f0d79f084fd"/>
 				</line>
+				<textField pattern="#,##0.00">
+					<reportElement x="582" y="0" width="44" height="13" uuid="33f8c648-d177-406c-9bf1-067a0d1efa03"/>
+					<textElement textAlignment="Right">
+						<font size="7"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{isentos_mes_rec}]]></textFieldExpression>
+				</textField>
+				<textField pattern="#,##0.00">
+					<reportElement x="626" y="0" width="43" height="13" uuid="69178813-36ee-4d02-b73e-9587d571c7fa"/>
+					<textElement textAlignment="Right">
+						<font size="7"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{outros_mes_rec}]]></textFieldExpression>
+				</textField>
 			</band>
 		</groupFooter>
 	</group>
@@ -721,49 +721,35 @@
 					<textFieldExpression><![CDATA[$V{pedagio_viagem}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="346" y="0" width="55" height="13" uuid="f4658312-8f00-41ee-b8e9-54414fffa8af"/>
+					<reportElement x="346" y="0" width="68" height="13" uuid="f4658312-8f00-41ee-b8e9-54414fffa8af"/>
 					<textElement textAlignment="Right">
 						<font size="7" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{passagem_viagem}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="401" y="0" width="28" height="13" uuid="6c26febb-d72b-416a-adfd-f13793ad0ca4"/>
-					<textElement textAlignment="Right">
-						<font size="7" isBold="true"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$V{isentos_viagem}]]></textFieldExpression>
-				</textField>
-				<textField pattern="#,##0.00">
-					<reportElement x="429" y="0" width="30" height="13" uuid="75f18e93-4f83-4654-af3e-2f34541980d3"/>
-					<textElement textAlignment="Right">
-						<font size="7" isBold="true"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$V{outros_viagem}]]></textFieldExpression>
-				</textField>
-				<textField pattern="#,##0.00">
-					<reportElement x="487" y="0" width="68" height="13" uuid="fb83760d-acf9-4d7b-bdff-000118021d0d"/>
+					<reportElement x="442" y="0" width="68" height="13" uuid="fb83760d-acf9-4d7b-bdff-000118021d0d"/>
 					<textElement textAlignment="Right">
 						<font size="7" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{baseCalculo_viagem}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="584" y="0" width="66" height="13" uuid="365b17e1-7094-414e-87e9-81a0e28424ee"/>
+					<reportElement x="532" y="0" width="50" height="13" uuid="365b17e1-7094-414e-87e9-81a0e28424ee"/>
 					<textElement textAlignment="Right">
 						<font size="7" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{icms_viagem}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="684" y="0" width="50" height="13" uuid="4b8f07ab-dd38-417c-a125-3e0f0abee9f4"/>
+					<reportElement x="699" y="0" width="48" height="13" uuid="4b8f07ab-dd38-417c-a125-3e0f0abee9f4"/>
 					<textElement textAlignment="Right">
 						<font size="7" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{credPres_viagem}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement x="734" y="0" width="68" height="13" uuid="3c425e23-f770-4998-aec5-067e20e98e18"/>
+					<reportElement x="747" y="0" width="55" height="13" uuid="3c425e23-f770-4998-aec5-067e20e98e18"/>
 					<textElement textAlignment="Right">
 						<font size="7" isBold="true"/>
 					</textElement>
@@ -775,6 +761,20 @@
 				<line>
 					<reportElement x="0" y="13" width="802" height="1" uuid="a2876982-a9e5-4c2a-a4c4-0c658b73bd62"/>
 				</line>
+				<textField pattern="#,##0.00">
+					<reportElement x="582" y="1" width="44" height="11" uuid="6c26febb-d72b-416a-adfd-f13793ad0ca4"/>
+					<textElement textAlignment="Right">
+						<font size="7" isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{isentos_viagem}]]></textFieldExpression>
+				</textField>
+				<textField pattern="#,##0.00">
+					<reportElement x="626" y="0" width="43" height="13" uuid="75f18e93-4f83-4654-af3e-2f34541980d3"/>
+					<textElement textAlignment="Right">
+						<font size="7" isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{outros_viagem}]]></textFieldExpression>
+				</textField>
 			</band>
 		</groupFooter>
 	</group>
@@ -934,14 +934,14 @@
 				<textFieldExpression><![CDATA["Pedágio"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="346" y="54" width="55" height="13" uuid="109e41dd-9e89-4d43-b9c2-370cccd6fa79"/>
+				<reportElement x="346" y="54" width="68" height="13" uuid="109e41dd-9e89-4d43-b9c2-370cccd6fa79"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA["Passagem"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="401" y="54" width="28" height="13" uuid="6b254509-dd48-4b5a-a3cd-5294607af7f7"/>
+				<reportElement x="582" y="53" width="44" height="13" uuid="6b254509-dd48-4b5a-a3cd-5294607af7f7"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="true"/>
 				</textElement>
@@ -955,56 +955,56 @@
 				<textFieldExpression><![CDATA[""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="429" y="54" width="30" height="13" uuid="5d7330e0-1cc4-47d9-bf1d-c296b257bcd0"/>
+				<reportElement x="626" y="54" width="43" height="13" uuid="5d7330e0-1cc4-47d9-bf1d-c296b257bcd0"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA["Outros"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="459" y="54" width="28" height="13" uuid="0840cd38-79ce-44b2-8a26-e17fe9bf3d29"/>
+				<reportElement x="414" y="54" width="28" height="13" uuid="0840cd38-79ce-44b2-8a26-e17fe9bf3d29"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA["RBC%"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="487" y="54" width="68" height="13" uuid="dbaa3f34-0b4b-41b6-8649-f62976acb543"/>
+				<reportElement x="442" y="54" width="68" height="13" uuid="dbaa3f34-0b4b-41b6-8649-f62976acb543"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA["Base Calc."]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="555" y="54" width="27" height="13" uuid="a9a2ab9c-bc59-4bc2-9fd1-693862894b1c"/>
+				<reportElement x="510" y="54" width="22" height="13" uuid="a9a2ab9c-bc59-4bc2-9fd1-693862894b1c"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA["Aliq.%"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="582" y="54" width="68" height="13" uuid="d2d56386-c300-4456-b07b-a518eb7e49c6"/>
+				<reportElement x="532" y="54" width="50" height="13" uuid="d2d56386-c300-4456-b07b-a518eb7e49c6"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA["ICMS"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="650" y="54" width="34" height="13" uuid="8cbcf55d-6530-4c91-83df-aaa538716fc0"/>
+				<reportElement x="669" y="54" width="30" height="13" uuid="8cbcf55d-6530-4c91-83df-aaa538716fc0"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA["C.P.%"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="684" y="54" width="50" height="13" uuid="27b5e273-20ee-40bd-b304-c461a08aea4c"/>
+				<reportElement x="699" y="54" width="48" height="13" uuid="27b5e273-20ee-40bd-b304-c461a08aea4c"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA["Cred. Pres."]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="734" y="54" width="68" height="13" uuid="e125e24f-708d-4652-ac75-d1a1841312f0"/>
+				<reportElement x="747" y="54" width="55" height="13" uuid="e125e24f-708d-4652-ac75-d1a1841312f0"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="true"/>
 				</textElement>
@@ -1088,75 +1088,75 @@
 				<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="346" y="0" width="55" height="20" uuid="d4cee14b-c961-436e-8b97-efd5e8e2d2c6"/>
+				<reportElement x="346" y="0" width="68" height="20" uuid="d4cee14b-c961-436e-8b97-efd5e8e2d2c6"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{passagem}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="401" y="0" width="28" height="20" uuid="e09cff5c-f112-4f7d-88aa-874bf8c7d9d5"/>
-				<textElement textAlignment="Right">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{isentos}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement x="429" y="0" width="30" height="20" uuid="a18093f9-73c5-479b-a02a-0fce55be0e35"/>
-				<textElement textAlignment="Right">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{outros}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement x="459" y="0" width="28" height="20" uuid="6d66a6aa-2854-4353-9c31-34633e99bc09"/>
+				<reportElement x="414" y="0" width="28" height="20" uuid="6d66a6aa-2854-4353-9c31-34633e99bc09"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{rbc}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="487" y="0" width="68" height="20" uuid="ea3b5d69-bd56-4138-b332-80fbf84e7421"/>
+				<reportElement x="442" y="0" width="68" height="20" uuid="ea3b5d69-bd56-4138-b332-80fbf84e7421"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{baseCalculo}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="555" y="0" width="27" height="20" uuid="e81872f0-0038-422b-8a25-d1abc175e816"/>
+				<reportElement x="510" y="0" width="22" height="20" uuid="e81872f0-0038-422b-8a25-d1abc175e816"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{aliquota}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="582" y="0" width="68" height="20" uuid="c6dc688d-59db-4ec8-a90d-4b6149048f01"/>
-				<textElement textAlignment="Right">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement x="648" y="0" width="36" height="20" uuid="4958eb38-03f3-4718-8ffe-a861484887ab"/>
-				<textElement textAlignment="Right">
-					<font size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{cp}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement x="684" y="0" width="50" height="20" uuid="f3515064-649b-4aea-8e3f-7066ea9c8653"/>
+				<reportElement x="699" y="0" width="48" height="20" uuid="f3515064-649b-4aea-8e3f-7066ea9c8653"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{credPres}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="734" y="0" width="68" height="20" uuid="50d827ba-f992-4127-b5b4-0bdb8fdfb019"/>
+				<reportElement x="747" y="0" width="55" height="20" uuid="50d827ba-f992-4127-b5b4-0bdb8fdfb019"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{icmsRec}]]></textFieldExpression>
 			</textField>
+			<textField pattern="#,##0.00">
+				<reportElement x="669" y="0" width="30" height="20" uuid="4958eb38-03f3-4718-8ffe-a861484887ab"/>
+				<textElement textAlignment="Right">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{cp}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00">
+				<reportElement x="582" y="0" width="44" height="20" uuid="e09cff5c-f112-4f7d-88aa-874bf8c7d9d5"/>
+				<textElement textAlignment="Right">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{isentos}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00">
+				<reportElement x="626" y="0" width="43" height="20" uuid="a18093f9-73c5-479b-a02a-0fce55be0e35"/>
+				<textElement textAlignment="Right">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{outros}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00">
+				<reportElement x="532" y="0" width="50" height="20" uuid="c6dc688d-59db-4ec8-a90d-4b6149048f01"/>
+				<textElement textAlignment="Right">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<lastPageFooter>
@@ -1294,147 +1294,147 @@
 				<textFieldExpression><![CDATA[$V{pedagio_total}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="346" y="5" width="55" height="13" uuid="480913dc-1202-4b13-a346-918723d705bf"/>
+				<reportElement x="346" y="5" width="68" height="13" uuid="480913dc-1202-4b13-a346-918723d705bf"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{passagem_total_rec}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="346" y="18" width="55" height="13" uuid="6f82cb27-2d81-4901-a533-5003687a2bea"/>
+				<reportElement x="346" y="18" width="68" height="13" uuid="6f82cb27-2d81-4901-a533-5003687a2bea"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{passagem_total_dev}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="346" y="31" width="55" height="13" uuid="1d830e4d-3d73-4d49-a110-766b2d7560a9"/>
+				<reportElement x="346" y="31" width="68" height="13" uuid="1d830e4d-3d73-4d49-a110-766b2d7560a9"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{passagem_total}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="401" y="5" width="28" height="13" uuid="61c7199d-c573-4f49-b8d0-9b623e6c4a4f"/>
+				<reportElement x="582" y="4" width="44" height="13" uuid="61c7199d-c573-4f49-b8d0-9b623e6c4a4f"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{isentos_total_rec}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="401" y="18" width="28" height="13" uuid="ea5ee820-bd33-4511-ad31-81938952c784"/>
+				<reportElement x="582" y="17" width="44" height="13" uuid="ea5ee820-bd33-4511-ad31-81938952c784"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{isentos_total_dev}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="401" y="31" width="28" height="13" uuid="05f00fbd-7c34-4c7f-9080-4885b748d89a"/>
+				<reportElement x="582" y="30" width="44" height="13" uuid="05f00fbd-7c34-4c7f-9080-4885b748d89a"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{isentos_total}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="429" y="5" width="30" height="13" uuid="4b516681-3b33-4859-9d69-b729bf21d397"/>
+				<reportElement x="626" y="5" width="43" height="13" uuid="4b516681-3b33-4859-9d69-b729bf21d397"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{outros_total_rec}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="429" y="18" width="30" height="13" uuid="5f50b932-bc24-41f1-a232-7c6e8dfd13fe"/>
+				<reportElement x="626" y="18" width="43" height="13" uuid="5f50b932-bc24-41f1-a232-7c6e8dfd13fe"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{outros_total_dev}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="429" y="31" width="30" height="13" uuid="9a35a1c5-b7d6-4973-85f6-b326c38fed32"/>
+				<reportElement x="626" y="31" width="43" height="13" uuid="9a35a1c5-b7d6-4973-85f6-b326c38fed32"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{outros_total}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="487" y="5" width="68" height="13" uuid="eb615f43-2580-4775-8c8b-b67f6d1f947e"/>
+				<reportElement x="442" y="5" width="68" height="13" uuid="eb615f43-2580-4775-8c8b-b67f6d1f947e"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{baseCalculo_total_rec}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="487" y="18" width="68" height="13" uuid="20f52ea7-acf2-41a5-a53b-a6589e32e122"/>
+				<reportElement x="442" y="18" width="68" height="13" uuid="20f52ea7-acf2-41a5-a53b-a6589e32e122"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{baseCalculo_total_dev}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="487" y="31" width="68" height="13" uuid="f1faaf6e-e6e1-44d3-8627-7cfd6c2804c6"/>
+				<reportElement x="442" y="31" width="68" height="13" uuid="f1faaf6e-e6e1-44d3-8627-7cfd6c2804c6"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{baseCalculo_total}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="584" y="5" width="66" height="13" uuid="5a8d7172-ec58-4cd7-99b1-e77bfa0097bb"/>
+				<reportElement x="532" y="5" width="50" height="13" uuid="5a8d7172-ec58-4cd7-99b1-e77bfa0097bb"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{icms_total_rec}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="584" y="18" width="66" height="13" uuid="bdcebb00-bc7c-4235-b324-9882d5db5814"/>
+				<reportElement x="532" y="18" width="50" height="13" uuid="bdcebb00-bc7c-4235-b324-9882d5db5814"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{icms_total_dev}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="584" y="31" width="66" height="13" uuid="0fc4f445-fdd0-4b30-abfc-53d634e10979"/>
+				<reportElement x="532" y="31" width="50" height="13" uuid="0fc4f445-fdd0-4b30-abfc-53d634e10979"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{icms_total}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="684" y="5" width="50" height="13" uuid="b0e80cdb-c9b1-43a5-b1a1-e2177103b1c9"/>
+				<reportElement x="699" y="5" width="48" height="13" uuid="b0e80cdb-c9b1-43a5-b1a1-e2177103b1c9"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{credPres_total_rec}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="684" y="18" width="50" height="13" uuid="2caf08a5-8d45-40a1-96dd-d2ac459a5983"/>
+				<reportElement x="699" y="18" width="48" height="13" uuid="2caf08a5-8d45-40a1-96dd-d2ac459a5983"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{credPres_total_dev}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="684" y="31" width="50" height="13" uuid="ee56f3ea-3432-4ff6-bbad-0c39a7dba856"/>
+				<reportElement x="699" y="31" width="48" height="13" uuid="ee56f3ea-3432-4ff6-bbad-0c39a7dba856"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{credPres_total}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="734" y="5" width="68" height="13" uuid="7e42c236-9300-49c3-8421-cc94481b8536"/>
+				<reportElement x="747" y="5" width="55" height="13" uuid="7e42c236-9300-49c3-8421-cc94481b8536"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{icmsRec_total_rec}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="734" y="18" width="68" height="13" uuid="5a784285-ab36-433f-9f39-2ce811ac90ed"/>
+				<reportElement x="747" y="18" width="55" height="13" uuid="5a784285-ab36-433f-9f39-2ce811ac90ed"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{icmsRec_total_dev}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement x="734" y="31" width="68" height="13" uuid="b4469bb6-b45f-49cc-a8cd-2f9eae411724"/>
+				<reportElement x="747" y="31" width="55" height="13" uuid="b4469bb6-b45f-49cc-a8cd-2f9eae411724"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>