From 037d93fbbdff164ce8943d20bc256297bb0f9271 Mon Sep 17 00:00:00 2001 From: fabio Date: Tue, 14 Nov 2017 11:45:34 +0000 Subject: [PATCH] Fixes bug #10152 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@76383 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioCancelamentoAutomaticoECF.java | 10 ++++++++-- .../RelatorioCancelamentoAutomaticoECF.jasper | Bin 43893 -> 44131 bytes .../RelatorioCancelamentoAutomaticoECF.jrxml | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoAutomaticoECF.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoAutomaticoECF.java index ac4194cf8..27e5b132e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoAutomaticoECF.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoAutomaticoECF.java @@ -53,7 +53,8 @@ public class RelatorioCancelamentoAutomaticoECF extends Relatorio { sql.append(" fr4.NUMSERIE20 AS impressora, "); sql.append(" e.NOMBEMPRESA AS empresa, "); sql.append(" fp.DESCPAGO AS formaPagamento, "); - sql.append(" ROUND((100 * cfp.importe) / (coalesce(c.preciopagado,0)+coalesce(c.importetaxaembarque,0)+coalesce(c.importeseguro,0)+coalesce(c.importepedagio,0)+coalesce(c.importeoutros,0)),2) as porcentagem , "); + sql.append(" cfp.importe AS dividendo, "); + sql.append(" (coalesce(c.preciopagado,0)+coalesce(c.importetaxaembarque,0)+coalesce(c.importeseguro,0)+coalesce(c.importepedagio,0)+coalesce(c.importeoutros,0)) AS divisor , "); sql.append(" ct.NSU AS nsu, "); sql.append(" ct.NUMAUTORIZACION AS autorizacao "); sql.append(" FROM caja c "); @@ -131,7 +132,12 @@ public class RelatorioCancelamentoAutomaticoECF extends Relatorio { dataResult.put("impressora", rset.getString("impressora")); dataResult.put("empresa", rset.getString("empresa")); dataResult.put("formaPagamento", rset.getString("formaPagamento")); - dataResult.put("porcentagem", rset.getString("porcentagem")); + + Double dividendo = rset.getDouble("dividendo"); + Double divisor = rset.getDouble("divisor")==0.0 ?1:rset.getDouble("divisor"); + Double porcentagem = dividendo*100 / divisor; + + dataResult.put("porcentagem", porcentagem.toString()); dataResult.put("nsu", rset.getString("nsu")); dataResult.put("autorizacao", rset.getString("autorizacao")); this.dados.add(dataResult); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoAutomaticoECF.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoAutomaticoECF.jasper index 9572077df918571dfa53132119cdd27b484f2c6d..b9d54ae78e35e749ca072322bd8b5e450712174f 100644 GIT binary patch delta 4292 zcma)9ZA@EL7`~SlS^?`up`~3J0~{Cq>ssRA6z<0-hN1}N&&gK_w8 z8PF4;e>LEEJ^cDNsgr^?q;7})HfS@u4#DK&A0k8p{ zlV_j~EbO%ab=PCqgtKeHV?`!#XqGWSP#F_qKw^Rb*aXkXGtrDqOgfvuk@n5t3+IHV z4Vl2fCS!u2GA6`;!~_Ab37(T@!iG)Ucir%~kvI-c8F7Njh>HP03dl@S*M5^(}xah{VWK8D5TJvTgOkvI-#WW)(7BQ6Fc;sn6rJSR{5 z3>I&D`XkS)NF0Y*8F7Njh>HP990w!MT1NVy_gEJ;M}vO zGL%&@0XFIlF}XA$$C9A{8_8t}*~g~1P&AfHm!ldF#baSE8H)+mW5*^USdsg&?EoF1_p;`2#CZh5XO zMnq`?a;EXek`czm1egdLEx@8Ofofl=3Lig( z2AuV6guHir)sXkOuL`bzf>8qs*=or%huAWhJ;qk?*{!(JYplVfp=nh5VYl7oboUH6 zoUJy89hZlv?`zfsAN!R>X4d&1ZRN@9cydoir+wgs!GZxc)0xRi&XRG*V5M6OPAihkl&y4)VJT z-{=hmaOYeh1EgOJ84WzWxXspMgC4qU4nYW_Iv!Q^cK6z(RrCr0L-yRxW#{m0mu7Jd z%1BX^3N#FDrLAzsbzpAD0L~4yE1NlLKc6VBO|p^LFl&Z4fg3ZY;*6IyA7{A{mW`T| zv5^!<9asz18w;l+(G<8n)EX!qQA6Q%NF2V#6r=E^5r>zhon?G%5@pixrdZ7A14J># zQKjVB96ZcXbQ1zcII6&6L8}S$x=5y3v>xZz+31Oc(o|2j@cF2x^mEf^M$#T^l^gdH80)P60 z(j~N9LLcCYC1BaOVOntyt#P<3W165crp187v>1?><^ic`aDCWA-vyN;SLh{hbEJvB z1L)DAeM&WSMM7b|D;~{v#RGsD*B0Um;QCWqqd;Acmmp)-s`z5y^(md| zJ`z!C!Q8mM_#eT|zhGhf2%J>i#O^iueq&-)-;Jm|4h=HC2`b~80LXW>m?Pe4QngXk zMZ?N27^ex`IytUh!b4UnLEmKkni{$>xk^JN%68Nc4xnb6b`$@zObdjFTOdoqk+i^b zavO1AWeYz{xpVe+Os~!UrRiNd(K&*S#g}oPvLE$;!%>+{A*f781i&4MIg*ZePOhV) zD?37)^3AEExvsWn9*6f4z1_w$Tj(fwGh^j{{yo#NmqT80NXU34sEk(vAg|40j>Ibu zz*8^1unF{upS|~7oTlFggEIyg$7eRvC&8teN*J%sxGF47)}1ZZ9owx|>%g|1mX;Q) XilTw#mHKSk^S^8^%ZI^}?^^!{jb3_m delta 4405 zcmbVPZ%h+s7{6;vi>O4b7ARc>25uP&6ewdVlgbborL6@z%~U+-^$(V|T(63vAP~s> zBCvPKwq#khFY}8_b!6FxCEL`o#APutF}i<#02jBpW!aXQXfm_Cf3Dnn^zegCc=Gi9 zJ@51T{hqsfx!(C!bN{C1LTh{0ATy%Tfjmb6=x-nPnb21pjPV4_nI49j-yMgaCBQ_0 zgDU~OnE+t-84F2k)CxBaq?;PS^+p?b%UMB5x$7MEl_5qPN>ro}R7DC6D5MYoOOa|a zq?BMO8(hy(QtTD$!Kv*QFzxE_)gVbYRH;ZJsEQ;SP)H&GmL%0=NUFk;rrp&@5_=zB zs3P#Qd&t*>q~Oq~B88wTQfNRSg#cKJRFfg45iEHA@wpH&4(%$$1XUrX0R=GuFtJpV zLEMgK@S69s?*JmlVZRDFK~>0UKtWCbOfJ=AknhLjk2*j1^&@f|f-2+$RUxMV1vvpQ zxm1%u9>nCa?yr19h#ZHc3OPYl$Z0@9P5?|U)nt$-G5IgPE50d2j>CisIYCv(X+S|v z08B2`WROo_@ z<8TQQP<=@Ez6b<(xy?pYozokRgm{q;3lzalOyK84&c{dnl1yk-WODntqg-WD3`Z(o z;zS+~PlKxUA}53cX-5|h7av5cI*}Wax1%9^FK;o#c|R8nOT4iCGF+eFgUPh4WiYsY zcw>1=TD&RuTpbtqwgDIt3Ca&~8kW|Dw92K+!DED4E=1yU12JKM^Ke0KfRBn)I}<`z z$74btTvtvy7eU%+A}NoVRC7rYUfmO1A161;pY!w%vTO=G3YCJN`iy!#%fcZ8+jPEx zSW1B+e_?ugW~N}Zw2ZC=a3rl@*l)IwUCi2-9i5&QZ;!Xd2U1pX?AzJ()Fk@lZP*Igo_3%+oB>L&ln)>1_74 zdAgh}iau3fu-6J6@cB@|x_}w(tO!_Oz9;ZB%p-v^n9l~Df_W-nh55BWDa`*0Y=ilh zU@^=)f+aAI1)qWWo53wG|1wyTg|55!dVv*WhfwR{5Nh#as2Juwp@M1*(|4*foDd}k zc)*N)cbl`T#hacH8voUh5pKU7LjE3w?CF_bnl=GfSihb0qz1Dq7K`v)G~Jd#bIWzP zJ6hoUosKTIx6Pey?>SVYfwMawF0^DwTY89K!9qCS_P7ETlNh=?yB*5z`C7e%Azxm1 zr_5|wlfqvZGs7@hV4}Z@Z2~rf30&A$J6NgWMyb^^Q?DaKs2O@(yi=>O# zH8@-*Bam5#1l~Z0j`kMlI{NXNMU*b0BUQTyY}TSt?H!ckK+a3W`?-Xwcp%#d zpzuHg3J(&X^Z-)FeC$o2ANqt{1fLC6vp2xST}2@0xO-IlFH(lXLzU?gR7DvLD3sBF zLYV}>nW0HB`MaffQyASgIiaZ6m#TY}jP@9Wm+*;N9W;oIlgj{ss%37VyKc9gaHh zQ(F!6x$=Iiai=o*poKP_Uf10`+C$XTPr*LMApup-e#iiNN8v27(ln> zUgQr4mET|l*o*yhiTO_lIuFD`T(79!tk7;6Z>++0gj2Y%iD{w@cp_ z#@ot5NGlG~L8!RZ2#U0}lT<}34Jfoq0DNMolK`^u`1SqvM4V+W0M}$8jG@VLRsd%w v3t&7q>DgG_P+QkfTU}GzVDG83*V}7fFfc6GG`o4OX6jz~`b-#9p11!Gt}vuY diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoAutomaticoECF.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoAutomaticoECF.jrxml index efc180492..d252b143f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoAutomaticoECF.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoAutomaticoECF.jrxml @@ -1,10 +1,12 @@ - + - - + + + +