From 678857ec22be3058cb11d6e982d9014250394da8 Mon Sep 17 00:00:00 2001 From: julio Date: Fri, 25 Aug 2017 19:24:16 +0000 Subject: [PATCH] fixes bug #9608 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73085 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioFolioRmd.java | 12 +- .../templates/RelatorioFolioRmd.jasper | Bin 30547 -> 34755 bytes .../templates/RelatorioFolioRmd.jrxml | 136 +++++++++++++----- .../templates/RelatorioImpressaoRmd.jasper | Bin 32953 -> 32953 bytes .../templates/RelatorioImpressaoRmd.jrxml | 12 +- .../templates/RelatorioImpressaoRmdBpr.jasper | Bin 33512 -> 33510 bytes .../templates/RelatorioImpressaoRmdBpr.jrxml | 12 +- 7 files changed, 118 insertions(+), 54 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java index 557351dbf..e60db2269 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java @@ -95,12 +95,12 @@ public class RelatorioFolioRmd extends Relatorio { sql.append(" eo.nombestado as estado, "); sql.append(" ai.docfiscal as doc, "); sql.append(" case when f.indecf = 1 then 'ECF' else 'BPR' end as tipo, "); - sql.append(" valorcontabil as valorContabil, "); - sql.append(" basecalculo as baseCalculo, "); - sql.append(" aliquota as aliquota, "); - sql.append(" isentos as isentos, "); - sql.append(" outros as outros, "); - sql.append(" icms as icms "); + sql.append(" f.valorcontabil as valorContabil, "); + sql.append(" f.basecalculo as baseCalculo, "); + sql.append(" f.aliquota as aliquota, "); + sql.append(" f.isentos as isentos, "); + sql.append(" f.outros as outros, "); + sql.append(" f.icms as icms "); sql.append("from folio_consumo_rmd f "); sql.append("inner join aidf ai on f.rmd_id = ai.aidf_id and ai.aidfesp_id = 3 "); sql.append("inner join empresa e on e.empresa_id = f.empresa_id "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper index b9d8eee4e299c18a5e4bfac89457ee90ff9a1291..bb160df433218f6d3141f5ab3494f6675b42b3a9 100644 GIT binary patch literal 34755 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

uHY{r4vU! z2?h5>=wLS^iTza)E1P|-%PI(=X17vK6Dd(U;z2rYA<(l7tD@mxRGpeUKNVQ z`|0$~q*TY%wY1h9-O$)v)7n&VbX@~Zc`^GFtw&HFHQ03_YsvP9ZORgB&Da(0#VJ~J z=3&_>kw_1=vDi`U-FEIb4Zs4*L#e{yibi7#g{s}`RyLfE8m;P}gU zH#{sH{nRngchpj03bQtPaLuNy$xT4=d@kK=zzL-D%I43XH&^?&fH)iB$IPEUSAI7r z3V!%izc~HBgP&F{o|QGYf(DTjUxN{K_I(y1IX_=>(xuawGjvXhq6RV4cw2MqCu@ew2(qEIgm z_zK7)(o!5EeYle^u+wWqBV385s!aw*`83>`w_C^Jky4eXy=G|XzM(!(0rtY9$nSw zTUp=W6r0lBj_D|>i(9^D5OG_ajS_yA=ynJ!Yh?M-{JBx?tjyn^E5P>JwqCendjkJ#@x)`S4b)ekfjvu3jxTH z)YS4aW{W^p%gTBOT2FGe*j{7~o)dUNSCUwijcC6jL(Ca%*tQ;bGRbqvL?3AzSs08A zGst(zz#fGgi95s$6E1K`I57=Ri9m~ii%rWgS+7g7_Ox>%QAyE~MCWv5xOIeZ%+gNvAKnq?qS}|J_nm(NrVaKd}$c^*C5$o$_T~jyhqLc-3k# zD)BYlcI0^&iOp67cM=oW=~@E2<_(l6D4)| zlFoXYk{7{VX<_tbP{oyuM@YGeSxP zpU8&{Y$aDR3~Y6VfvwIkuvH8c%f$8*v!IBj!?w@`TQxaqq%#DxLS!?B_KGdljqLOA zwUvX@Pkke+7Gn&1t03|sIUn{T(5!4cCIc%KUd2s?*I?-I8Vns?n}LEE@Mc*CEEGux z@0etG;kFe_uaR@wuHSB_iZAU-c_CwrAA0MxXY%e^n)TYd*PgrLg*te-8pcl9MV(y4 zH>;TN6~P!6d?nWfU!7s#t1}FI6$2$Q@g3uo(Y{HCZ;=bW;~ckGjDKmeeJ1%&_CJ>m zgF}D#H7=w6_^j@&qb9#*y-(b&n!)S4xVYIknpc%{-pJq3V zb4}Oc#V#$LKfOjQ=OinX^TojgXLTFyK-y^p;cSRAvBlp2q2VPp2L02H?Db&E%wLB& zPg#{ryn)Q0L=lHSQHlJa#NQtos+c(Xmwf&fOrE4YS_mtYIGqxI5XN2taQ;4xtU9ge zV|8$BJC3sf(rs0VKVSpt;qT*Ms}A`GLsB^tw7;-na&hFhK*idmrk%WE+Np^093UBS zWndb~T331J#}hx#@%aB_$tBtY{`&lXAKiub%J?@p`&P=DQtP~hbLTHwym;}Vg^LgU zcI*5_3l=P1n9Dd9>$*e!sTMl*9cSFBQTGGJeE=_;)VgAmCN(?iP z;l%Qlk({xP!P%6QjI^mq&h}4XJG0;%M|s;D5wMKlOsaDBjRf6o9@s5aXW4+W15(~L zSA;m5obm)#q0}l07pI)d?GZL~YK@Assi`k&6X%>An8J6N6?el-TS_si?=~;XSy3Vz zIkC*yv;@g$AZI1Z4Ht7w!3|btdB}~4$s{>}Ze*`oENRt*v*J$LD$}Z+&%;?++D#Lh zEXpkpoQ;-=sKb;XK{B4S@t!lUq|5IeIJO;#y!$&j8!KWDoecQ`&<=qip=8<>b@v=O5 zca)dq%ex9ME0A|pUgni|HC{Ga-W}~_h4QY>i*MpY%Ex$Fk-V$-vSNAH=!H!c+!bCn zR^GLE@n?7hZKaoumv_f{*#vpF#>*zkyLDbRN!}grW&6pyRxegdCR05EUN%MEwR_oA zd58LbL*8|H*#Yt{2g| zn_1+$$;)QSyHmYv7AvK)obF|_<=uC^Y>vD;)5{K#cV~H7nY=sO%gW{5IbJqb-hI!@ z=E=MBz3fnVccGWfmv`Ui__J5okRVT<_0z^Hs6~5!3{^g$?XsL4^>UOgmt7AL#Yyt8;VN62+AeQwI|<8$N6gaBCs!md`!Tz*fZf1; zf|_C$X*g4ESl?WBGfH4|>K=A0s;tVXnOhIL9mYY?9Xsn`cXFn$T6);s=zG*-#tN&4 z-J3|jF{vK*Q}hh#dDE79*aPU<6)RyxJ?tSga)L}dJUr}S^g1?8Gn*dvD6ETOxY$b% zdn{2~%}{#SE>y$KLVDN}oT)We5BoW~F9SZuCVJRYiHe!V(8HcdAmLa+4|^^_beL8!(NBX+cwU__TVLH;5_UPxR?F1hy4kCFPSzE`!h0DcFn{73aN)t^RT~@ zK~de~k(P5rlry^Wd*V@bwU9%Xv?n0)pD zWtFQA;q&kkw2%!-W4Hq`lo&Un&|W@XmTm&QHv!eQA4QVbtB37ipy354s$SclUi*Mg z2ApzZ4@5TzOJ#}0`8l}4a%0$ozd)z1u-YOHn=P)e*y0L%Ev~TE;tE?WuCUbN3Og;X zu+riR8!fJ|(BcaFEUvK5;tJa=uCUDF3cD<>u*%{Jn=G!d$l?lnEUvJ|;tE?VuCT=7 z3Og*Wu)^XB8!WD{z~Tz~E3UA<;tJaOtC=j$s?&?wp3V&xDJ!4bIK^fc#>BemPS6Ay!4MV~g2O*tgkj>~MBB zQokRkDLu@-gJWBku%EM|*t5uOH>+STvr6_Vt75;$`pTbBX3j2Qm&&F?ic)2YN@wq2 zSCr1#!G2hJ$PRW*qNY?w#+sl|E8ylf!*OlFJ8*Pl3jAe;tuufnR64ulx<}Ye7JGu- zg8xYhW|!P%P>uxU4ui4;l)DVdQc&(OD3zexXHcp^x!<7Fg7Tn2Sq91ugR&fyM+}M& zl${2p0hFH^lqOIfHz>`ZJZVt;pbQ$6RiHd=P*#KTtU*}|$}bGcaiF|lP)-2lMT2r; zqG?uPB*54@H0f~=t>YmUC*VNJR<@R%$iggu+0-@&Ogmh`4)y>GvS(N)`yK0IZ$r%f z!$Q1}oy4cH_54s4=GCl+uVTHt8;3Pp7vhC|f}J#Gq^i@=p9t#%}<>ZTMY=-;eRT z7e7pn^4<8oj^AGVK1JT>@GQ(~Ths7EH*evPI{XY7vV%vBij;=EO=7 z+aO|jNM#CQeNL=!EH3~tcPAgcW(O~O-=2VWYL(Hiht4HkI zhj_7oh#iI4MNVuUVi!2E8Hk1W06rIh!-p39Ebo!a65uh*klHqYGKfPJ-Z14 zcQd<_-43C<16K7O2;RNyDG2b3puEH$fdD?r_OM+L!pGTOHV8p{iv0^qR9~@Qz!!QE z0{MUFU|)ey{)$gwzlC7_4teZ>aK6D8vo|52f9ACq*sNgx;C}WF1od6shH*zH`zH^v zPav?LVo~%92lXOsTMn zDHT>RrNSzvR9MB73QsarSjChItC&(@6*E;>5R+Ay2bsmYFk!Zy-NwV1i0WexLYW@s z{p?A;0n;z1Ksisv1jl#TYkV^lax42AKO1uj--F_vhhhCi7-(Y(kzdLSplpTwN+{G- zd%AbY`KLZth9;v80YpC#Vpu(>~g$e}D@A5!}BZ_E)IzUi|kK zRQNrp@cU5VkD$UILxn$s3V#k2{ts06D{F?utuo89=2jTErf-4r32nN3bX1j6G#7WiMJ4>?Ny)y=K+2J#fzcW*x)!T8-?V zRulV|{7xT-k?feSsa{goM2mB`M zhx}gaNBn;4I=;)go@Nc2QzlRF%feQZ#D!dme iJQW@bre5M~yz4?f{)AS#4W!QQhUHjmXjgj>qW=$mwo+vP literal 30547 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 JhhC{m{4f3H - + - + @@ -17,6 +17,21 @@ + + + + + + + + + + + + + + + @@ -30,7 +45,7 @@ - + @@ -40,13 +55,6 @@ - - - - - - - @@ -54,47 +62,54 @@ + + + + + + + - + - + - + - + - + - + @@ -104,42 +119,42 @@ - + - + - + - + - + - + @@ -185,50 +200,50 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + @@ -236,7 +251,56 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper index 5e34f20a25107212effd6afa3c19799f129ca4de..6c9072ae5d63b693cf5bda4c6e6f42503970e289 100644 GIT binary patch delta 163 zcmdnl$h5POX@h$3p4kV+09oz8*3G%$TgK3Xz!~77YQOMG1q^WJ7kD$seLQC$DMX1pu|ZGfV&g delta 153 zcmdnl$h5POX@hz&qw!=(1?kCaB4swm2j?*|8gD)qG80HmmQsa?&JT+QarbCKxJD6i zAVm`+CopoCFcyG7T@i!+WJM9B&3@5+j3QF diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml index 03cf3f475..e2996b431 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml @@ -170,37 +170,37 @@ - + - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper index 21f5ff786ab8124e44b430896ba43928a488f720..0cc98fa2d3ccfd6e43dfcf2d2308897faf37b314 100644 GIT binary patch delta 145 zcmaFS%Ji(2X+vuWqsZibMd`_0(K4I&hU75kh}R<_#_Y&895b1y^or} z$QZS`A!Y|7U*f5MyY?|KFz7LQGcssSc61XJi8nMgFgCNWG%_?dH!_bmF*Gwa-CPi- Ut0I9_s)WI4vLU<7kh}R<_#_Y&895b1y^or} z$XK$uA!Y|7U(%_6yY?|KFz7LQGcssRc61XJjW;wkFgCL=Gq5l=G%<=dvNSR?ve=v- Or>i1{U2gKmCQ|^dGb(BT diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml index 89153a31d..449ce2723 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml @@ -175,37 +175,37 @@ - + - + - + - + - + - +