From e8669ef68855006b167b924bc518344f2b0796a4 Mon Sep 17 00:00:00 2001 From: fabio Date: Thu, 22 Jul 2021 13:20:19 +0000 Subject: [PATCH] fixes bug#22751 dev: Valdevir qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@107951 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../templates/RelatorioLinhasHorario.jasper | Bin 115093 -> 114404 bytes .../templates/RelatorioLinhasHorario.jrxml | 378 +++++++++--------- 2 files changed, 189 insertions(+), 189 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper index d0e127d136480f0066d5bb3fcd9d35cee5727b24..b736f46dc034c55cd91cff6e348feb8a33ec4ecd 100644 GIT binary patch delta 26871 zcmeI4d3Y4XxA&*Ix~sa=(?H0uBLu=4_CO#ai+~a!gf+6r8X$xykdOq~gs_N$EP^GB zilCqfD2f;)Dw_!W5M1~PqN1Xp2q+4Iih`o=sbxAdOyB#y&wHPH??2{w>Ttews{4GZ zx~IEO&*+MI^vn(N%9}>5);{$Y1OICMeLmcScW@Q(73BLGu@UaJtf?6HB*q002`hZ@`LzvWK@J5#uvxeEGIB6|~t zBD7z)sdY1uQ3Ep1D}JV4zSvw_Dot|z`0f_+*=F4kdP%qyTEyvy3b$W!Ke1zUS;(WUff@*WdxT6$=_4pmCn2}r z3X>=cvt1%&i`!OfC{MV*w{IXY01b8Nm+8J&B{ zM2o}*|L!6;sCY-$@@P}>umLR)J2f=6`00T=5o*nb4*tMs1yq|@=71V(_DGuzy8AjC zKRm$34(X>>ITSfN~{S0fWr_PVU4@atnmR>DW?M* zt59!I&ULnILVzu~CqteoZlvtJ*IDh{0J~*;Z#bPo<5!Nq&PwtE?70a8)HxT5G?;ju zb<7X2*13b_iRo^$EB8A4pdi5B&Fje{aL(~quNFO)y>*VWf^z_(ArwoSkE3~6|Q?9eupNeHm zr{2q^ud2cNCzWRnr&SL&tB5)j!AG#{J(>4qHXWZiF}rEk@wu6WpZ$1f-RJFo`a$!d zu0G?w%<+@6rcUzB@}+m2?el?yKXc8ec?CQ&%;(#ekq3Wn;4>K*_#XvEssO7w#xTVG zR$NALRn@NfuEdVVgm(HV%N*D#m|O`Z#^883ZDA38@Cle!H@LJC>X60<<1a#d-*F|( zIS)P=_282M7CR;`DSXVR@HwbJ6yG`EYl2dPb1I`YD2C0O_OAabP-rW;c|4DeyuT_t z^i)|kZ+e$No4?_Y^Yi8Ml>?(w_Sy7Knr^YCAJz_R;xYI`;qiZ8tI8(K=;_zX^6|p> zS&Nx*HKmT8jvB}&JsOu3J|=uRYE0B}>wZ2RHmoR?O~1coKwKwo2HJanmR+5*2vb$C zNbSKQ1A--dOazMx+`P0p>^i;)`+9bOE#6U{%^K1+AnpM-^Gq69m5rX2W+!qcVHyY~ zsXdrvKrn@miC|KJC??o7Fy+jx%qADz8Q|B%r~}4%&KITGDV#@`)`CZB4;~p1JmF&^ zcvK*Yr#0IflZUh9&PlVoau#9k5G+!Au*iU52_F-|q5@GYuxnVG z{P_Vkb8h#5xRZPF{4zJq&fq-4^bk=2Kpy&(2R{l@{(}FYYeGUL2EH?j^55 z10G7V@8{DLX1bWB)E?860Wr<+F%i>Lfv9Q1u3?(#ivq0io&fv1K+xY(Zl4#_dkfO+ zg&azlhXj<=9#AqMpu)#QK&e0!6zm$Hb}bID&laWy#NF77r~kugc98Q3vqJDl?ZG1h zf+u`T1dj?t@xZQuCv|CnWiCo7N4;3~ElRVW<1E6g6D(4Du*iU52_F-|q5@GYuxns> z=aB$=`>g<+ZuQyhggAaJ(dKz^r7uadU*%lFydt=y_TZ8M!4*Cxf=dOWxM0`7m9ad) zhAiz~Zoe1H2TRlJw>XP1y9JBX9xO5-Si;9du&6*33+x(LzIimjzIdb$f7&W{#f#_e zWoh;YoJW}V1dr4nJTf47!pB7Ls6Z4C>>7Bo9t*H>%lq^58OM9^e78K!{(|!e^O@k0 z+Ji?11W)*w2p$!P;(=WQ&y^Jc_T_$l$&%*~+yk_=H*@u6S@!pwNtpA3Noo%!84yh2 zVfhZo> zHSpjk0*tIo7oV?0FP=FodlVT2fTYnSMfj7gibmr_1V)BEE=B~xVMBpPSRInvJ@ zV2=cQ3few5(FQZyplU4U@$N-Nfa3~N-UC-gJ#fPV5xC)j2wWA2#w{;!ryY%D@uPLN zENHU$C%Ob$12X@!!=GS3n_iVIf1&}3hlkv1>{N3qo>e-*u&8I1m?zVU>hie>li)Eo z8TFW3cwl7sp$HE|%uNL%=jOw+j07>a@gK#q3ahf%jt>GgZ26oAAN$Y@OP}G5mW)56 z|7#W0RDkYQBSsrO5n+-&CL*IA6A2GQOe8!IF%cEWi@m9MGLps9{PCHwP=eG5ZmEo{ z;+)kb2&J-GPqza*{OR6cUw*m+*dL#647Tbs8DMjt84UK&Gi|`4wcWt>Slf=IB9xa` z7|iUCDzWbC{A|nGWQcsbwlmlU>-csv*9`%CVjbUKJwIDePA07S?|gPjP({pHR~mZUcMI3vV?gW}y$aXpsa* znUF$X`J|@JlapGvOls98>DHvAl%$ko9-%O(RqK?g?1SEoit}GgLmH`Ayl1nHV81n9 zs?E;6GzZlc-or1iM!&J#*DA6OTY93a?86<+P&c+?OJ~<_`bt;n+ucNwd=Gqt%CXa} z;@DelW7vDIRC7mG-g>+1FWlNLYO6T0Rotry?x^fnOLLxib-mmFW^w7B8f_~bvvFJW zUaK&4up(P_uuNHNLSEL0?EKux{5pX7TpF>Nuk~{G`sZtHT|axfnib6U%k6#K{t+bu zmH!euR}!5q9_A2WBf7+}`(Ll_ZguE&$;k6r#Xa88kP4k+GvDkcefylde0A9Ap>gcJ zy?$16M@@GpxjR~d|Ll%ofP{87C%mGkWmub?>0v8hUu=4Hc5IB8qa3npXD`^szsudG z^R9I0ShlNKXeS4Dr9nsR?k1s*J9c-6j-|WZ5&L%Y5oPxzheq_+(+@gU?@5Z0AaKPh z48{*e71^adt-^?!veOR+DrJr;$Q>^iU%r=7^n>3@3me;v^<5BP``)S)N^M=Vo1!=3*dqs8 zgym@|PQ-t|-QRx6JtnP0?oRtEXt3sk_VoxGo-EJyeL0XJaevzo`#t*yz+1w-``tDD zWj|lj4hQCN{c9@Nyo20+cd$ih)A)DN(K$Bpo$K&<{P4BJFpLiDa!K8? z8ND+)^&HW?Qy+dN6EOyMaO2ROayBH?^zsI{F{~RlR_nLbeo_wzwjA`Dp zGF$md8Q_b5e-T1=u+1Mdac`fcHy5*(xVg|H9c_NQGKEQCeUHQusoCjct~=)o*Ij!y zu8JH0CyTtvgkGtc3F5Bs>yiDm$rK$fAx$2gR>^%g)y}=z@nHkhM!cRn3r}?X znWX*ALuP%LS|#GvXSV08!n75vQVUk)a#rPXR_R8wwiT=yAH!SPqs`dJix%r}tW3Gf zUKIBotAX0F%uf<-VoBpH!gLobQVSO4au(%s7U@Q_bQdfspTe8wkLn1PrK@5Bcf(`M z5-*}Whgf}Sg*X`!>rQV4yF_U>xVS=3! zQ5=>2WRX?I7|*I)$Qp8Mepwk6h(y=E2(YBjT9t!JBRa>j&$`(2cn)Fah>1xpQYe?F zP%clQT%KZ%NRjnrKrZlepEoPl!Yj{>&r|K?JdZGsh&)pBJce*t-&!z1)ywlJm*;sz ziIH97aGvQwc3O^9fHT z3|rm+CM2~;rd&v72shXwnV`#AV+;p^{evYO|_@e=ROqjD9V>sr@BkVhEv@95e|McLl(;|wv7wP+GY zL%p@G#SytV<5~X}S^Hg(2X68C#_pT)sLW^2LuUS!i8PK!W*Oy~iE=Z4c3qxX_165d zl4dy~_1+)kNA9oh65W^LQK<)fpIYY@o>`b`9+_oSWL7TEtX!U1xgv8lhAwtz6E8G$ zUwKDmJa8ekP9vUCn1&u1WmIHTF3+f3o>93XV?#05;3fHiJo!VTa{SeKRMw;)Q|sKy zvkKG3Bdd&xtjgtCmCLg#S7dD?vXaXI*7;(xcn=?yaqUHM>ejVVd0Jua^hhhCBCT?H zTIE98D$45ASjn3D3>EhHyWXz zScPLh%Tv7e<=X7xr%o*5Pf1ZM_g@xQjk;DQXAx$E2aAjf7Ugml<#HD3Mzf3%EZu$$ zu(?<214j)1xM}=_dlbs)D+*;IM-gVc2a1de6y0 z0*Jq9=Wha|fO`I-fM#$YVWxQi$*2HQE(cOB2a;|y&@>kNYa3Sncm5fPVPk)-=Hl?j z>L{Eyeib-%tcN*{Fbh0zM1Zwe3|BxokZ~O4avbSK<1B#nsjXRa*`#Z?01;mtCsw?( zjY6sZTWXykrx0d^2ZfA^MNuxNP%fvCZZyRTPT{xa7QpU({EfyEalq>RUe8?}{?rjpkYxTAhx6-oln%t0QPaFW7IQY0GcK zb*-(OM3^leBr+;Ul*>t!%SoggO|s?Y6?%kCI$w?bew}~LV**X#bmm{y+{9Fs_4^~W z&Tft*%uWv^85Ky%v@QJnh<{N~kJ0dGp{oaZFMob@1)Q9+_yPNG~+BHd_` zvp~`WvCyGvgU$tm2o>O~Q}cpzOcXGaVVha`zJ_d4pjNPlhGx|HlamPZvj>Tc3KHdV z66JCd=|+?M%t?Za2>fDZdPYoe0Y<(2nBOGI^2>nri@>os4wu*1?aJU{f+i!+g-oWXWAJAa zZ3))4Q6SjHMBTjyZZlzEK@8f09vA1#b_@0J9@#1eMt*O@E<2QkUADGS%d(+wN}Bw~ zEA^s{I<_Ck7fF~5k42JEk42IJxk%xIA{I#nq82GbEYg!DPx?_IDtjLs)8+s9$=9b0 zOwcF?OR)-;A`t9f7IpMqihn^QI4u@NJ{6pk0E=;`9BS`9v~4U*e-)p;FpqmoUq(Hq zF9UM=;e#TkuL4oie_Tv|b+BQ1^tm1XpU=E=9O}}Z-9KthHOihxvs zD9D!qGUCBtO)xnCpTGg?X!-u*^XhN_bxhdHnT6Ty!7Ku-Q>Qp8$Ltl9HRVQfd<3No z1W#8)w+CleMzO&|6;Q31sqhYEUj{5--{2dS(Sz;}=1O1S#vEbrrFU>b6_nQg7$*|u zLk}Vu^;kt2kgFIzD1uJ~qE_)k{#|A;yDA##R`(HbeOa~O)vBmR`_mjwn6EtGWYhyr z1|(egpa?h>h=Th{z+I|_hVj=N;&ng-9ACNV)nVl>aX4Xq^njC54>%c+aN&a@;8Y+A z?nePvcnccgzA=b`Lp4y34ly@4oiKlR(8;I=oeW62@IeuDDiB5YhoJkT2Fh|@Dn!vO zt%=fXe#4Z;3VzrI#Sz&NoKp+M8NwI0MKw-hh7*JWHxt;FAXpHOhPp2qq6o^@0)i@> zK$uFBKz0a%H0jH9 zB|H$ZHYyOsQb(}NPCz}yONl6!s|mo;lCucYLbAvX$s&CZmheCXiwZ=sv=A&m)j{dv z?L;_B@XKbXYB0Mlz}(JZgy|q*WQT;2z6VTrAOc1OqF_1*n9O=`If8fH;uS?S(4~3+ z)QbZN(^CS;4hbZE51{Zs1ds|u0reC>-_=LG#jgURVMa9om?0cSn86Z8c1RfMd%%PT zB4AV?3TCi?8QKtya(@664fI1p0LtM&!emPz*&%_X?*SAZhyYT7D4=WsbT$#)Er9r2 zlW3rcjR0s02NGto1d<&RNctW?;eiMs6^H_wEP%!}1|T?p#LJ3kpr0C}W}03mSgQ%D zVbAAa!pxIkvO|JN-vcZ>5CNtFQDF0edz+vIVwL#oifE`QO<|Q7hY@DEgpnN*M*1Ew z;eiMk6^MdaE>>w$Gc;Jded9j~ycsCVUdvg8d0Mi_4#^^Y50>yi1d9qpu{

y2sz$7iw{sR> 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 BN2>q; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml index 1d5af80a4..e141f6409 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml @@ -1,8 +1,8 @@ - - - - + + + + @@ -240,159 +240,176 @@ - - - - + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -406,167 +423,167 @@ - + + + + - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -582,262 +599,259 @@ - + - + - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + - + - + - + - + - + - - + + - + - - + + - - + + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - + - - + + - + - - - - + - + - + - - + + @@ -856,12 +870,12 @@ - + - + @@ -876,29 +890,15 @@ - + - + - - - - - - - - - - - - - - @@ -907,105 +907,105 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1026,35 +1026,35 @@ - + - + - + - + - + @@ -1068,36 +1068,36 @@ - + - - + + - + - + - - + + @@ -1116,147 +1116,147 @@

- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1267,7 +1267,7 @@ - +