From b681b8be649bb4abb00e712880e2402db31743ee Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Mon, 30 Oct 2023 10:44:46 -0300 Subject: [PATCH] fixes bug#AL-3280 --- pom.xml | 2 +- .../RelatorioReceitaEmbarcadaServico.jasper | Bin 56538 -> 56524 bytes .../RelatorioReceitaEmbarcadaServico.jrxml | 58 ++++++++++++++++-- 3 files changed, 54 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 5c692980f..f2f0737be 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.26.1 + 1.26.2 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jasper index 4c7308d5b5f0b4667c7fc9e35f58533bfef867f8..dac112a5b808bb32b4c4b755a9c6be7aefae69d2 100644 GIT binary patch delta 9609 zcmb7~4OCQR8prQt22h4i2T?#2Pz!|+)JV%O!~wy9K^Xi zH+8i%(bcTB)X>`8Ogff*X;Plf?i!VD**Uvq$M&>sXSdaTpXYh+%pLBfT+ZP+&vT#u zdw>7;z3&}n?r`Z__F#6om&fTp90Tf*rWSXttHFPi#5FFD*WIW(2Z^ieogR z^YPrv5D9cb>}@V%O9|+>IAmIGT-zuEH8!+*@`T4 z2-Qr^H;ee# zhP~dP#z?+7`r)MXf%_#fs-jLnke_MHAN#8;;EwHvc!6eGE9-c#So5M zs*y{n4p(S^D>Qw%LE-#*nc1E>WNTJanry{bf z)TtmZl=_gxfW$BdkyIm+QXQnw08(f)$T^67Yi=&za#i+tmRuI5!1K#|@I?T}un^%? zBb-tlxX=JxXf*JJxbITS2MKsdxex9w_rYBN$54%Msu5194qRveE;Jf=HNs2nQ3%JI z?Wik}?XxE-8>EzK=Az)u^jwZh3_uEP~n^LuK|pq9l=y1 zm{J|E&;VFyG~jjwKR<6!P*5B@J})Wy}+}J z?2W}K(>*Ox)N*H=Gqc{=Seuz&-{kaOy7un=Po`Y|CPSMbG{2GOzzBxJXoPAsLaB}sp#dX8qcL(Aj6{Uk{BOc~ zSXQOtqlssId>jWK7+yjjRHF|{b$kd7_z)V6kC$*q*cM0dtFm}8@e|pe#UuOj;m>;z zhS!i!HS#Id;R_A$g+{}F4f(5;MlZ9LhELo@afo!AHQy(1U!ckx!`(Uub|YG#Y*nd!uR?XMa|uu#=pl zA}-<^hGL3rMN)h$(DCloLOEf|?8lhCjh|qu$q0t!m5--TOYLnO$rPZ`4D*a1v9mp8IMKaY$ zrc{S4G(Z*_4f$Ijn~ZklGe{3})+iTcU(HNE|KGsJ@FVi6Mn0uFe4zop&}jHS!X;p< zU2r>Yasm0M%Rg&_ky9xIu}-%+glguj^`&zg%;V`O8CatF7$SyqDD{-j9)=)X??cO? zIrWug%6xxV=AW+t-Ud?$M>5q&7AcS^)gg<9hK%o`W5P-UKfCp?FKQJRsdXwBL%{`x zICMcZx)3S2pj5|&XlPu-;rwsZ#lU`ZD`cBnMNS1WhGZmDjbxDmnNl6HXlTgENKRiK z#>qL$ft=i!$l8|oz0(XCz{fBa`BWocq`;?Chc6l${#e*=k?>c@-6%ea_pq8@DNAsG zXYd+0I^2*01~5!S15~2{k%9qAbqt7x#=t~efc5p`#H;@K`U2AoKw+4MD5?=9Qb19v zgAxr5Y8t+6Khtm*U+e!g&{|JZrdI+?3|3@PjZBdOlTsa~XlR&LSYMXdG+s=vuBpJZ z08kj_A&P25i4;(j>YzkJgPPZs-TZ~jA8A}}OJ#Spm_zDhxw+ZPzB@i76i>rjjVQrM5D=5b%?Fr8JfuI*h&5GDxmte{LDhhyAN%1kZt7 zaezS})}Dxs(4Jv~2hOm|lN1W0ywW&4?_WIe!xRg|c35qBxmJtfG15DX4@>ussGJ3KGW`QaNXO~=n@9mF>k8iXCnUx?@)gFsMchD z`mELzWtFN<4D+qheXSYF;Wv)Q13n(TC_4+E;;9w(JN6V;(GGzzv^{0ti2(bV7|!m#zchu*jitE-mVU(Y5%&E3Q{|W0-|jC- zxZ1yH?kW&%U1d$U*1zbVD4MX^mI)^FY}Sfmc)8#vA-(|N8}*YnNuqhPqpP#{*{`e~ z96}G+*xZh!NHHh;m}rbf652fW(|a?8YlB*VBP!Tf_Y)Ms<&8%b$6urq+Th?H+e^arHtPg z{SI8UE_<|UpgCX-erfQ3*NxK|TxQ9$6!Kd#fc$`0cCoV$%wU~QC$g0FR?||L7zPKE zA2x?j%^qKGobHNQ!FtyZ<*yC=5pY-PgX3jG+sbAZ^LT9N3fO~2 zFKc<|0RN+Sh20r$?0_Q}JV>V+>6Gfw)r|nU82rZ#F4@CUesfdiPo_5BCVK%MFW~ST z`X>M7R}$}5<9#e;a~#{WaiU`BNw9=rJ6fU|Em5jtN!9jGcaXGWs1F6~^uD;J+iqa{aRV>PN4pieDDAk#R zx)Cr3G1xx`{+L344%;@}E#@$j`!D}L<}f|b|7q}#;UxN}8vRqM<6qqf@Gl1Y{h#d5 z|FSLBx3pU#9__Q<@VVQF;XL}K8vRnL<5%4X@GA!U{hrtJo4oY_c?CWPJhgSWyqooI z%`p8HY+$&IHmC+0b12oZp>71&5DmUdVINA$M>*qVe3SdiV+(I-sqByUS*m}4M-11{ zBh|Q6lGoTD zWjnWBeF1VzsbCsI5}Kx3$F#bk{;H7%r=n@ns7xp6nf`poLT-5S&Ra8lVCOOue3lEw zkc}p()-kDW1el}-niQ#jWwZ56!Y29Xw@U_8BZY63NxPJ-(!MJ#yg_D5Hv+)aK(Nqg zz#VMeK987vWT!IwiJi*qw}J@_ThIj6IwsVO0290bZzq zUW7*D<)F9~qS@KsjTZ}HKA2}Z25<~V5KgrYT-^wOQv=~bqk$j6g$O=WfD187;5Q!< z+aL_y83kit-z_#zru4Lq2@+BxzyvkWgwSYAoWd2TdnQ-l-+U&|^e%ugyp6M`S_iCd z1c0f5V4=}~--g+Dy?i)YPOP#@gKC`ozi(XLyrza`cfD&Cueb@hid}hjbixJrR+Rrl zw-0~_=}LG>GhATF&yATr^Sv7sRz06hb^z#30YASP8yWC!9IsH?VBRgmE uq@24ZWKGN&KPkrnVREP>%Tfkg5j?Ex;B$Y^9vZ7B@=D|Jna`WOasLCO<|E($ delta 9613 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 s@(UWLmIM_3&A?wEt=$*LPMlBpKdF~>L;wH) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jrxml index c7300aa00..7d0ce2014 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jrxml @@ -1,8 +1,8 @@ - + - + @@ -91,6 +91,9 @@ + + + @@ -98,6 +101,9 @@ + + + @@ -105,6 +111,9 @@ + + + @@ -112,6 +121,9 @@ + + + @@ -119,6 +131,9 @@ + + + @@ -126,6 +141,9 @@ + + + @@ -133,6 +151,9 @@ + + + @@ -140,6 +161,9 @@ + + + @@ -147,6 +171,9 @@ + + + @@ -154,6 +181,9 @@ + + + @@ -161,6 +191,9 @@ + + + @@ -168,6 +201,9 @@ + + + @@ -175,6 +211,9 @@ + + + @@ -182,6 +221,9 @@ + + + @@ -189,6 +231,9 @@ + + + @@ -196,6 +241,9 @@ + + + @@ -203,6 +251,9 @@ + + + @@ -539,9 +590,6 @@ - - -