From 37cfa51bd63aaae98f82e7b9aeffaf69fd22bb95 Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Fri, 18 Oct 2024 17:10:49 -0300
Subject: [PATCH] fixes bug#AL-4889

---
 pom.xml                                       |   2 +-
 .../impl/RelatorioOperacionalFinanceiro.java  |   7 +-
 .../RelatorioOperacionalFinanceiro.jasper     | Bin 77959 -> 73909 bytes
 .../RelatorioOperacionalFinanceiro.jrxml      |  89 +-----------------
 4 files changed, 5 insertions(+), 93 deletions(-)

diff --git a/pom.xml b/pom.xml
index be5b515e3..755a97b47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.160.2</version>
+	<version>1.160.3</version>
 	<packaging>war</packaging> 
     
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java
index d3731362e..d552ccd79 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java
@@ -206,11 +206,8 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
 		sql.append("              THEN 'VENDA INTERNET' ");
 		sql.append("               ");
 		sql.append("              WHEN c.MOTIVOCANCELACION_ID IS NOT NULL AND c.indreimpresion = 0 ");
-		sql.append("		     THEN 'CANCELADO' ");
-		
-		sql.append("              WHEN c.INDREIMPRESION = 1 and c.MOTIVOREIMPRESION_ID = 99 ");
-		sql.append("		     THEN 'REIMPRESSO' ");
-		
+		sql.append("		      THEN 'CANCELADO' ");
+		sql.append("		      ELSE 'OUTROS' ");
 		sql.append("		   END)  ");
 		sql.append("    ) AS tipo ");
 		sql.append("FROM caja c  ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper
index 831a7381c43f5210c3516611ce4de901752ed750..a8e1499f0b4f19432ad05cfa5859d9ac17ab0721 100644
GIT binary patch
delta 14490
zcmeI336vGZxySpfy>9ot0>cinOAN9&BH#j|5Q5tfP#!@hiW3+RgEN4G(HG?63Zfv;
zQ7~u()J#A{U|>K{7R9)Ns1ZS;1{Z|5gheHy===9_?+nh3PhMV5a&q*XYOB7guCJ<Z
z+xPx{(@x$gR%{SU>ZUo%&#$PTp2?}9zi&o^ignj}M7{haGtTmx-}{8${H6({gAV`p
z`7Qn1=B50%Z|d(ionPDk<;?@LJ^6m!$us<|zpm>~nC|&?r}WGAwDixouYTA&cS_Qq
zbZ63k@Rm!f^}c!k0)NW`_5Aa0EzCw+`G3B3p1<X`l4_B!%IEnX|GsX;gz3jn?v;vJ
zzsimeR{FDWl^6LJW}{DFg;!)-!OF`0XjP-DMKddEKW9ib8m(x_T~%kd^5Yfxg>(DR
z)&Bgs$GVBK(z2q_=Z`A6tjOOtGtYlx?r6HY;@rEN*IaQ$^LtOG?DU!CR$YQ%sdfDo
z3;I_ZQ?=Zr|C9R%RqKhCJR%#3mV0UW@M@80x&5)Ao(tO$rTqC#8v7F$^>piubtdZY
zP|KhBNS=z?{?0{t&7<m=D>1@3-*KKCI0pY@hu86!F3W2ak3mN`tbb-mEx+f3hp0uE
zX5d5TyT=9Rg@;yQny4M7iK;o$#AA>~#nqX88!_F=FKyMq|LMaQ#M5tlxVPImm_9t@
zhto&xaQdj4WBPbZu#0$1ja}r2sVWzbi&OP}q_=xkkSaX%3{yqzFjZ8|kt!Y&q>9JX
zNYyh;)n&=ZIMvD}J>C96s_@V+Ock}mR8ciYs(4J0DjriKRlhLR151Avr)s*ar+aab
zDm)a1siJn6Dyrs46^{v0#bauuDhyL4DlUpsO|0ncULK?h50{0hqIQ@ns^&-)j|o!6
zV``+j%)h-+3xC-112n<kd1+&R?21D7x*%0}nCKT3HPKQ1x-eJNmm^oy5!~G>u7<bW
zM1R0J`TmT`5%K)BR~FXtgZab54AkhbzqDgx9R>U_Ni-lwlBgq05?8|{Gr}Y%uNoF7
zS+=Usy+2429_9y|@bi`q^!>gKn4TXFe(BNS@!<Zehj_X&7#$ueqAf>(a5Ygi$7<p+
z!ItA{xSEPELFt;oae}wkAi>i?g7C00N)QFY1W`3df_O}jAg+c9Hiil4@n6IVCO?h@
z+k*t*VQZ8i3WN!wYK{c)m>@x14HIk)6Z~#%ah#y-IwbfYNDv-&M+u@pm>{a=NDz++
z62#Ro!R|0YpY@ppPpwCS!$E@Za41R;1;PYTHAjMYOpqY1h6xS@2`b**Fo}*C*7Lcq
zR<Cs&rz2}lPG|qMvSv+&=65^k)RVfM+U?}dC!XA8XxEdwoZ7Xsc8Hwze*TNCD>gs5
zv5voBYm3$o(ZiPJ(qeMVsFJclMWe?Tlf#ey;W-{Hp`{6$O3VEBwjS4hIjsm9l?m!Y
zGsvlbdC^rxokkaxjO=t_*|<?9BYTY>F`{^!rbiRB+VA>W_u7xq<EYYF%+{hq3q$Mu
z8(zydkI@rB^hy7**V;6GivAEZo+if|UR+i*YIMiZ!MCKLXZ=I3<=f}!g@nUs6Zr){
zZjv_iB00%;T-mtdVV9K}dZ}8dXxyj~IQJED+{~y^V=(4ba%#tcvEz$M%0>+@8eVMZ
zwW?D~$Cr&Oz0%Nja#HcgF~!4+MvlVSJK|xjvAQdZM~)wd*c(+dUR5-@bX@oaZ|E(5
z-?oOd(@$(~e*8NL=hNUirNZkpzHHR!PCqItE7r6tLGL>Qf{PL?Vvj#yd%bQSAjf6J
zSk<_WW0183yZDG4!bSUQaDDDWx~j|FtF&}<aZ!n;{r)}Mo0#SFNrDd0r~dlw4e6l&
z#pYK27u#*4<@9-id^$vqXz}Dc%=9HWj-ju}f239Y?uI#7TAZ@@iZSDguPic*RV^dF
zzD(ewiHBWLic4ac@=ITD_ya?ZEymu*V^8@WOVCaDq?k)i;)*Lrb}T8yUNJW5FMhpQ
z+gfycf;zC;xN}%-%$GUuC!>es)Vk5B_5A&>xBEfEU}zuKh@3i^QGKo~8+8S;1Y?^-
zW1Cj=-to0tr*2b6INWhk>#3m0BK&)W|KQhWq}g7_VFw+D_eEKNa@cXiV3Z2Sktvj>
zD6LU;p?u^xst3v(lmm{V`=Knvg%T)rP#U2WI*x6IavaKdlr4^vI05Bml%0;_c1JlE
zWdO=hC+)b?P{D-meJD#&)}d@d*@3bL1&i|}N*)R(_S&O#L+OQ5fP%$(!%#|4u0gpG
zWfsajl*K5Ip*)AO4F#L<_Mv?3ILQRc327X<qMU^?6lDU+WRz!6wxYa?vL6LkC1p^s
zh!hr)!Xi?qp`48}2xU0RIFv~!(^2k5S+s_xUL;o1w1V<vy=rw^Rrk_|g9Z-=dHbq$
zyjLy0y;^)zwfKf=@fFqL3#-NNsTQBvZn-n3l4h<aKacLHq`U5N{ONo8QIS93K=avW
zDpIqzG^W$7yLlNsQc&(bJ$q*}YMxiYE-QC_Q2pG6{v&^>Zz@*NN{ssD?6FO$zQ5$-
z`qUwuXa*<c_xwOJw`tUM$p>+lKjT1>B{l@n_R(NO#H_uRB}PO;PyD26sPGqmh#oiU
zdGW){{PS8;vVmQK1ud?mRqJVPLAhNJuGr4?C+xYj#(vDUu-ClwUG`(Hi}K~zk7*lq
z9l0O<d=UM{e)O1VXwCiTdQs0e_M=u~KWj7lQ4fVHRuA~M?>R#hl&fJmHzwzW!{lAx
zWn=Q3C~=OBiI1bM>KjXu9|XU#FL6pVvgW?{8&S`Z`|?wt8aMikco`P!xBRqjdi6ys
zX$`jfoA6$oT1o5jXhS7!MCi`w_C%wSo+&8j`R(%Pxk}oMYFkvdMAar3`G?H4;z_h#
z$h6qkXyJ?~C)<bC`mi;%pq#yf))SS@GM%rYi9GSpr_p)_t=W^>Qp5DiVJ0>Y!RgVO
zaQ-YT;g3<rWK_3C)d{F>i>hN$eLbp<K=n^iwGh=eqiTOt{~T5Op!#-HJq=kZvkPgD
zR(f@|*$mC)*;XyIR%KfZt!0@OeS+4Ku!YUiF0>xY_H9G9cf)M72_2VI(tCIeVA#4f
z^gce1-KZ{KLz#~zJujLk{A~V``8deOEFVU*OhNVIsCsR1ULNgTNx|i=Iy3wTX=wFW
zg<RlhQSJ!7iatZiUYO-?(Jb9CZeX;mKRD?VgE^}rtLO{No=1nH+vLV*T(quoN9EDi
z1?A3X7(Y0(F=sbgW3sK+(fWC|^+LNmMqyfK1FAf#R-!7SYTkpW>!=>w16Siz|MP>T
zU80-CX@%If%*A!;Vz7+{+jdP>GOwWh68yj<=Pi6`o=X?__xx>IdJVN=&roajDz#y6
z({b#tRFCbYw(J14V+ZL3c8EIhB<1tw)R~_|U3gdO#(N{ymrmj5Qg?naoxy)eXY#4k
zi_fMX@%e}?pg#NoItLf?JpM8j@b~B^d_N7~Um|vxE)Wh45_vRObf6(=aVGst6woE&
zrw9(Fp`wt6i4rOnQ)r}^OQXc^=@()dVih!6RMHsnER7TIP?`9Qu9BRtmPr~TQ*@22
zP1nk%G*LFE>t$=YLAIsI@>IG-_NJ+_Kiw)XrrYG@G)+#X+vRU)rYt94E~WIZ<yyK!
zK2LYbZ8TfHhm&^E9Jz<?mLJhQaxcwSobFTg=mB*+m8<r&P@Rfc4_c(oq{Zq&TB5F?
zWoi;FSJS9c%|>hvtyFVqjap2Pt7mAP+CdxCZhBJfN9+J?RG-l^+R}5nHNBv_rfIY8
zO<QyUg8k?vJ%C=-!|63Wk+$oZv_t=v-q62CY$3g=AELMQI(k=cr(OC(+O0pQzZgz$
z8$ll!O@B3YXs@Y9pO{AUscA}|o3?bwbfz!Nne?S8pu=VeVukdTxr8w@mI?DKCQW(@
zQ|1n)%>ri3I+idmGta!mQf3c3#(c(VS<Y(PTC9#emNDCm<=K|3fjy2jw8yii_H@?F
z7O)ofQr5~2XKn0Q#KyDZ?A7dt_EvU+eSmeat5_%d6w9|SBDRH{WM5%j?Jjl-ercYT
z$Yb5pi5BdPL_5|saRTd^=*W5}&SHHMg{*I)gq@T46+16+6Jj^B^AoqQ{)xNU1&K;F
zF!3xKl-SA!C;p7sPIgh^U3PKeARFq|W<_orHq6au#qR0sVz)aR;r3*gyXUfBxCN}#
z9l*x816i3nl#O?P&aQE%vGjktGuT9T4okap*$wV}>_+!@Y>K;--Qq51)7*7zy88s1
z<!)lWyM@hmcd$9`o9u3P54*?xkj-}wvIXuT_B&6qa?h{_y*&1iSD!8Mnz5x`OSZym
z&nmr6Y_->ot?^D{>%3lUz1N3r^a|KhUVrwiH#p6n^9tE!Zy0;g8^K=jO4uL0v22@n
z4cqQbU~hOgvNyfS>}_urd&j$jz3<IqyS@9^hu&iLk++oX^B!aSy>;v}?>TnR+r+-`
zwy`h09UMO?IeB}y^!9P(eZmvo*W67qeoQjKYbBGsZt?_PFWHedN~XK=#>rE8v*cO4
zdGbfRb#f?gll(b9J~@H^Fq!5Zl9PGI<WzoA@)_Pa`8@BI+{#Z$Zs*;T@A4kW_xV}L
z{k&K5Q~u-RVcs|8@bglJpPzDh|5P3ykgCuBE7gn-O10!eQtf$RsuLfYI*nhN>cNMn
z&gR9b^Z2N<Q-k>Bsf&0?YB(=VjpSFR#__V$cz$(i62B&O1HU#koli{7<kzR}<~OA7
z<&#s3_>|Pc{I=8zJ}tG1&rGf5cYs<F{>-oXrQ^ro06YfqO^Fu1ah%?0;X5(z>w*@(
zEaO)2`w`!aajOwp_;QR}E*_t$;PF}Y)O30|wE!c(br_%LwCDFb-S`8}X?&s6hc9x@
z<^_wL3;83?AYS1V@#W5NzRD@(k2>S{<Ic5wtuu)~;Y{JrImC{ko4~|i55N!66sN!A
zd=En3gAi`NIhCwVH4r*AxRrk!#^$1STU4v0d(rrH^~S8~jTvan9?**FnWA_~pFU_9
zpp;Hy_M@B$Cm<n^D#Ks#oYj_D522~y3h=YJ8kog<Sr|f{=H*VUvyT`Vqgu@gk3}fn
z_8OXtUvcwS(*2cGUhZ^=2ZuWX)9LQPj<C9>xo3$l*|*FB*i$`%m135}hTOBn*ZSLM
z5k2E!m}f-pdE$@hf14*BhI!oF^8}wT7W^&q%m$CDQSr87EM<A&CbL*tbMAkm+bxU7
zHCOo$-EQW(niC%V?Pl8Mp5^FnH~oC>S&sI0(_?babF{ac4zBDs9znsi`Hr_+I=<av
zYY^XVS!;la{!foG+_d2XNDZsGx+8Ab_W#-kWY&AsT;@M?$I5eRPI&ZptoS(hEJt_8
z3P1NOM|;PLQ*zI9w0A6jBlkQ<dB^hWG0m3B_>K*o5Zulc2;Lb!X`v+e&?*n{o6L7z
zbww21{C>tse5)eLq)E0*2aYIi#*Qe{+K1%p!@ep<l<9jFeH*jqMT#iX_bB?NXBN#M
z4Cn}H6s|HWjewu1{}ZfHW;KB|TAf{KB#knCkVa`(qf9fhMsX{)MnS8}8fE&9(i+W+
zu3|1}ln(U>eTy{;SAbKiTcbGkU9Hi#NTW0^&p+K7<&Z|9WOHT(_h0rmi*q9u6aRMu
zY`O}q_^SY|%g~B{;h{AIt@u%n*7;~<f3Y}cpcOw;(03wQn=>DA?5E<7G4NCABLr3b
zYN!<mDxlUYK&@A49^Xz2`Rnu$f0I`5w`diAhc@tcX(QiFoA@5u!at(z{A2nPG}C+h
z0PW@nX&?U^eFEilm>*`2AZ7()o=~iw(5#_wSxe!uHfd3dbr7}LiJ~6sEgG-_(U1)h
zjo3)hn3ahpY^FGt-7lK6rJ^NUBVft|OqqZw6EI~sXRm-M6EI~0rcA(;379egQzl@_
z1WXxXeFaRJfGHC&Wdf#5z?2D?GQ`pg1XP)TDics;0;)_vl?kXa#10FnG67X4pvuG$
zai)MN6EJ0n4HhtE0;WvBlnIzJ0aGSm$`Gp%Fl7R!Ou&>0m@)xVCSb}0OqqZw6EI~0
zrc7L)maPR;nSd%2P-OzDOhA<hs4@XnCZNg$RGEM(6EI~0rcA(;379gRvrE8~379eg
zQzl@_1WcKLDHAYd0;UYH9s;IJz?2D?G67R2V9Eqc8Deup8mde{l?kXa0aYfT$^=vy
zVh03NnSd%2P-OzDOu&>0m@>rr379egQzl@_1WcKLDHAYdh%FQ_Wdf#5z?2D?G67R2
zV9EqcnSd!1Fl7R!Ou&?-1yq@UDics;0;)_vl?kXa#0mvenS?5nP-Rk@DH5hk!jwsv
zG6_>AVag;-nS?2mFl7>^Ov02&m@)}dCSl4XOqql!lQ3lxrcA<=NtiOk#>?Yu`f3SP
zCZWnCRGEY-lTc-dZIMuA5~@r>l}V^F**(!h!jwsvG6_>AVag;-nS?2mFl7>^46&Of
zOqql!lQ3lxrcA<=NtiOkc1oBs2~#Fv$|Ovg9F}(TB~+P&Dw9xU5~@r>l}V^F2~{Sc
z$|O{ogesFTWfG=L!jwsvG6_>AVag;-nS?2mFl7>^Ov02&m@)}dCSl4XOqql!lQ3lx
zrcA<=NtiMTQzp|;WfH1PLX}CVG6_{Cp~@swnS?5nP-POTOhT1Om@)}dCSl4XOqql!
zlQ3lxrcA<=NtiMTQzl``ButrvDU&c|5~fVTlu4K}2~#Fv$|Ovggeglas4@jrrl86c
zRGES*Q&43Js!TzZDX209Ri+vxyDFG61yiPA$`nkQf+<rlWeTQD!IUYOG6hqnV9FFs
znSv=(Fl7p+Ou>{Xm@)-ZreMkxOqn`Am39?WnSv@)P-P0LOhJ_?s4@jrrl86cRGES*
zQ=?LY6ik_dDN`_I3Z_iKlqr}p1yiPA$`nkQf+<rlWeTQD!IUYOG6hqnV9Hcr%J8@P
zD);2y^VM1D%=0+-E&X!zU5O`mq|GvYUC{T(>~lQQW|_W7n`K&mSDPtlGX-s?pv@Gt
znSwS`&}RJ<w3&i7Q_yA#+Dt*4DQGhVZKj~j6ttNNv{{4dOaES*egFPI@DhVJ6SwA^
z|E%{1SmPr_P0l~FX9dZ3`7`^!_Wgl)KUov-AMpNw_To+bzrR3`nKycYAZ}&gFuF0~
z7YKsBDmZMG85+}JJT#`m#{aSx2r|oxUm(adV-}288NEP|>5EY?>dT;DwAuItf_Nky
zB?{sNg5XS8YLNTUzCe&U^9U4-X8W!v_;30GK}kBko*6=mu6&I*2#&1*XbOO)0B8z;
zrT}OPfTjRw3V@~nX!y(bCIvuK05k<a!(YMQ!(YL7D*&1TpeX>FI?U3J2BB#Xng*e1
z5Sj*|;lHsq8i1w&Xc~Z~0caY4rU7UgfTjUx8i1w&Xc~Z~0caY4rU7UgfQEDSY5<xB
zplJY_2B2vGng*b00GbA%A=X!)lIG`X5Sj*|X%LzQp=l5rVhc0?O#{$008InXGyqKl
z&=5PU0caY4rU7UgfTjUx8i0n_U=2Xi05lCi(*QILK+^y;#40oZO#{$008InXbQ*-F
zL1-F;ra@>Lgr-4g8t*b_0GbA%X#koAplJY_2B2vGng*b00GbA%X#koAplJY_2B6`b
zT^fL<0caY4rU7UgfTjUx8i1w&Xo&UD0JO9Qp=l7B2BB#Xng*dEHb(={GyqKl&@=!|
z1JE=84Y30nfTjUx8i1w&Xc~Z~0ceQz(*QILK+^y;4M5WXGz~yQY@r6AX#koAplJY_
z-mTN0YY>_Sp=l7B2BB#Xng*e10GbA%X#koAplJY_2B0BUr~zmOfMx(_27qP&Xa<00
z0B8n)W&mggfMx(_27qP&Xa<000B8n)W&mggfM%Me?db-DW<Y2Lgl0f!283qtE`tG}
z8339Apcw#~0iYqa#Q@L@0L=i<3;@jl&<p_00MHBo%>d900L=i<3;@jl&=9-X0MHBo
z%>d900L=i<Od5oS;7$WVGaxhrLNg#VgLfGW0L=i<3;@jl&<p_00MHBo%>d900L=i<
z3;@jl&<p_00MHBo%>d900L=i<3;@jl&<p_00MHBo%>d9004;4mXa<C4KxhVpW<Y2L
zgk}I}27qP&Xa<000B8n)W&mggfMx(_27qP&Xa<000B8n)W&mggfMx(_27qP&Xa<00
z0B8n)W&mggfMx(_<|8k?)PT?o2+e@d3<%AD&<qI80?;e~%>vLY0L=o>EC9^{&@2GW
z0?;e~%>vLY0L=o>EC9^{&@2GW0?;e~%>vLY0L=o>EC9^{&@2GW0?=%abn<-*LbD(=
z3qrFXGz&trc$dKf&@2GW0?;e~%>vLY0L=o>EC9^{&@2GW0?;e~%>vLY0L=o>EC9^{
z&@2GW0?;e~%>vLY0L=o>EC9^{&}<TfW<h8+AhafUm!Tm0M2@K}`u59ES^RvCsVr{A
zR2H{lDvMixm&z=t%!0}+sLX=OEU3(a%FeT(G7BoRpfU?8v!F5yDzl(63o5gqG8<4C
dUOaa2DtehyFX#WSQ0AQE?`wc}Zcn88{{yP9%OC&%

delta 16705
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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml
index c6fee178a..3114bc21f 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.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="RelatorioOperacionalFinanceiro" pageWidth="950" pageHeight="595" orientation="Landscape" columnWidth="930" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="3ee05e26-199e-4ad2-a96b-dd421627aceb">
 	<property name="ireport.zoom" value="1.239669421487605"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.y" value="11"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
 	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
@@ -39,10 +39,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 ($F{tarifa}
 .add( $F{taxaembarque} )
 .add( $F{pedagio} )
@@ -59,10 +55,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 0
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-0
-:
 $F{qtde}]]></variableExpression>
 	</variable>
 	<variable name="totalTrechoTarifa" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@@ -74,10 +66,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{tarifa}]]></variableExpression>
 	</variable>
 	<variable name="totalTrechoTaxaEmbarque" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@@ -89,10 +77,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{taxaembarque}]]></variableExpression>
 	</variable>
 	<variable name="totalTrechoPedagio" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@@ -104,10 +88,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{pedagio}]]></variableExpression>
 	</variable>
 	<variable name="totalTrechoOutros" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@@ -119,10 +99,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{outros}]]></variableExpression>
 	</variable>
 	<variable name="totalTrechoSeguro" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@@ -134,10 +110,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{seguro}]]></variableExpression>
 	</variable>
 	<variable name="totalTrechoGeral" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho">
@@ -156,11 +128,6 @@ $F{seguro}]]></variableExpression>
 $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
-:
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-
 :
 ($F{tarifa}
 .add( $F{taxaembarque} )
@@ -178,10 +145,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 0
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-0
-:
 $F{qtde}]]></variableExpression>
 	</variable>
 	<variable name="totalLinhaTarifa" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@@ -193,10 +156,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{tarifa}]]></variableExpression>
 	</variable>
 	<variable name="totalLinhaTaxaEmbarque" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@@ -208,10 +167,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{taxaembarque}]]></variableExpression>
 	</variable>
 	<variable name="totalLinhaPedagio" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@@ -223,10 +178,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{pedagio}]]></variableExpression>
 	</variable>
 	<variable name="totalLinhaOutros" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@@ -238,10 +189,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{outros}]]></variableExpression>
 	</variable>
 	<variable name="totalLinhaSeguro" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@@ -253,14 +200,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{seguro}]]></variableExpression>
 	</variable>
 	<variable name="totalLinhaGeral" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha">
-		<variableExpression><![CDATA[$V{totalTrecho}]]></variableExpression>
+		<variableExpression><![CDATA[$V{totalLinha}]]></variableExpression>
 		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
 	</variable>
 	<variable name="soma" class="java.math.BigDecimal" resetType="None">
@@ -283,10 +226,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 ($F{tarifa}
 .add( $F{taxaembarque} )
 .add( $F{pedagio} )
@@ -303,10 +242,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 0
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-0
-:
 $F{qtde}]]></variableExpression>
 	</variable>
 	<variable name="totalTarifa" class="java.math.BigDecimal" calculation="Sum">
@@ -318,10 +253,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{tarifa}]]></variableExpression>
 	</variable>
 	<variable name="totalTaxaEmbarque" class="java.math.BigDecimal" calculation="Sum">
@@ -333,10 +264,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{taxaembarque}]]></variableExpression>
 	</variable>
 	<variable name="totalPedagio" class="java.math.BigDecimal" calculation="Sum">
@@ -348,10 +275,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{pedagio}]]></variableExpression>
 	</variable>
 	<variable name="totalOutros" class="java.math.BigDecimal" calculation="Sum">
@@ -363,10 +286,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{outros}]]></variableExpression>
 	</variable>
 	<variable name="totalSeguro" class="java.math.BigDecimal" calculation="Sum">
@@ -378,10 +297,6 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
-$F{tipo}.equals("REIMPRESSO")
-?
-new java.math.BigDecimal("0")
-:
 $F{seguro}]]></variableExpression>
 	</variable>
 	<variable name="totalGeral" class="java.math.BigDecimal">