From d35dfed2c88d21382f441c58559535c106d9c335 Mon Sep 17 00:00:00 2001 From: "igor.rodrigo" Date: Wed, 28 Oct 2015 16:43:18 +0000 Subject: [PATCH] =?UTF-8?q?fixes=20bug=206555=20inclus=C3=A3o=20da=20data?= =?UTF-8?q?=20de=20devolu=C3=A7=C3=A3o=20no=20relat=C3=B3rio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49536 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioCancelamentoVendaCartao.java | 5 +- ...torioCancelamentoVendaCartao_es.properties | 3 +- ...ioCancelamentoVendaCartao_pt_BR.properties | 3 +- .../RelatorioCancelamentoVendaCartao.jasper | Bin 37245 -> 38338 bytes .../RelatorioCancelamentoVendaCartao.jrxml | 70 +++++++++++------- 5 files changed, 50 insertions(+), 31 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java index 34b56f3e5..0511e03da 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java @@ -39,6 +39,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { dataResult.put("estabelecimento", rset.getString("nombpuntoventa")); dataResult.put("cartao", rset.getString("numtarjeta").replace('*', ' ').trim()); dataResult.put("datavenda", rset.getDate("fechorventa")); + dataResult.put("datadevolucao", rset.getDate("datadevolucao")); dataResult.put("valorvenda", rset.getBigDecimal("valor_venda")); dataResult.put("valorcancelar", rset.getBigDecimal("valor_cancelar")); dataResult.put("autorizacao", rset.getString("numautorizacion")); @@ -62,7 +63,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { StringBuilder sql = new StringBuilder(); sql.append(" select * from (select distinct c.caja_id, p.nombpuntoventa, ctj.numtarjeta, c.fechorventa, ptovta.numsitef,"); sql.append(" (coalesce(c.preciopagado,0) + coalesce(c.importeoutros,0)+ coalesce(c.importepedagio,0)+ coalesce(c.importeseguro,0) + coalesce(c.importetaxaembarque,0)) as valor_venda,"); - sql.append(" TO_CHAR(coalesce(cf.importe,0) - (coalesce(cf.importe,0)*(ocd.PENALIZACION/100)),'FM9999999.90') as valor_cancelar, m.descmotivo, ctj.numautorizacion numautorizacion, ctj.nsu, c.numfoliosistema "); + sql.append(" TO_CHAR(coalesce(cf.importe,0) - (coalesce(cf.importe,0)*(ocd.PENALIZACION/100)),'FM9999999.90') as valor_cancelar, m.descmotivo, ctj.numautorizacion, ctj.nsu, c.numfoliosistema, c.fechorventa as datadevolucao "); sql.append(" from caja c inner join punto_venta p on c.puntoventa_id = p.puntoventa_id "); sql.append(" inner join caja_formapago cf on c.caja_id = cf.caja_id "); sql.append(" inner join forma_pago f on cf.formapago_id = f.formapago_id "); @@ -87,7 +88,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { sql.append(" select * from (select distinct c.caja_id, p.nombpuntoventa, ctj.numtarjeta, c.fechorventa, ptovta.numsitef,"); sql.append(" (coalesce(c.preciopagado,0) + coalesce(c.importeoutros,0)+ coalesce(c.importepedagio,0)+ coalesce(c.importeseguro,0) + coalesce(c.importetaxaembarque,0)) as valor_venda,"); sql.append(" TO_CHAR(coalesce(o.VALOR_TARJETA,0),'FM9999999.90') as valor_cancelar,"); - sql.append(" 'OCD' as descmotivo, ctj.numautorizacion numautorizacion, ctj.nsu, c.numfoliosistema"); + sql.append(" 'OCD' as descmotivo, ctj.numautorizacion, ctj.nsu, c.numfoliosistema, o.fecmodif as datadevolucao"); sql.append(" from OCD o"); sql.append(" inner join boleto b on o.BOLETO_ID = b.BOLETO_ID"); sql.append(" inner join caja_det_pago cdt on cdt.NUMOPERACION = b.NUMOPERACION"); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_es.properties index 93cef0cfb..1771b8c59 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_es.properties @@ -18,7 +18,8 @@ label.data=Data da compra label.valor.venda=Valor da venda label.valor.cancelar=Valor a cancelar label.autorizacao=Autorização -label.motivo=Motivo Cancelamento +label.motivo=Motivo do Cancel. +label.devolucao=Data da Dev. label.sitef=Sitef label.sitef=Sitef label.nsu=NSU diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_pt_BR.properties index 86b8bf59e..450b94ed5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_pt_BR.properties @@ -18,7 +18,8 @@ label.data=Data da compra label.valor.venda=Valor da venda label.valor.cancelar=Valor a cancelar label.autorizacao=Autorização -label.motivo=Motivo do Cancelamento +label.motivo=Motivo do Cancel. +label.devolucao=Data da Dev. label.sitef=Sitef label.nsu=NSU label.numfoliosistema=N. do Bilhete \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jasper index 0c314a3eecba7c3c6fbf539b1f60af8cfb59a18b..6483678eb21428a0a2df98fc96273c5fffe517c7 100644 GIT binary patch delta 12017 zcmcgy31C&l)jnrlAUDZP$VxU62n4c{1(Er!Xv7_bhmRK%YjpB*t<$!q&a z4a)(3(zKTT@%jWPL+fY*KRzQO*62(SL(-}?utXz{(d(fm(Y5g5ypn&WtMcH9^Nq>1MgW(Fk)7?Q+Gs7m$$)oidp zRR#&w@EHX)UP9fH8_CmivP19q?6c3#i^qphF}Xr@RZapkAf*efB&iaTl6^oj8!V8N zK|(ToMnOuIkQU60Vd8 zD1!hq)?i(&@eB)iZf7RHa!we3GB1)ZojD%!c~VOPe5XEWngOM#=CQ6{QLprC9}${H45l<4qOkdoe5%7$jLDF(}yw2D8C}K^Y_l z!)FwRB@)B_S&_V|U_t2pzQXc&L4pQNa!GCDE&1s|9RipnP6pIm?YOoU`qA@%xtg# zQwAA1!)H|Fu92_QQxwT3&aE<*)sDGd4BrwMB)M5)P_hpUW`hNTGDr-D&nOHxOAM!q zBRMacZ(w-8$cy0~fkBcz5`&U`U@#jj7?eR`FnmT~*dsB_S{%kdDo*D27X{PW35i`K zUXhr777-&y3UM}1T9q*M(57czx#Py6!Kar_`7|u2iVvR}@;oUNJ?M1dJ7*UJ?G>FQ zd00Mzl6^da*>EYCwR?6SFEKwx3g4BLt@1nyJ z<z6Qv)lBDnG%{Ml&Y_<#~gGo*o+jh zGxmJEz*81ZE;uILf=8lJ<51NFUO*Iq3a%_^thYC`HrVUy8k$s`j&aYzycWYDOj%k> z>uPK5rA-xewT6=%IYN%yx2`Lz)Ya4DY;$+IdX(Mh9%^*2DOpNGG}n5k2rEkb%q(<@^psBoJWUp2i?BOcsQ89~lx?34Me#9iPIR*GjA z^7~T8s-%f(fG`==E=NyC*2OMYm(wvEQ(jUPPkm@d6kI?M?@wP)(p1t~QCm@3QBrM& zX#z2_11|7Ks-km8p)@(DQT>}6n@buh>W1S<6OK0~^ryfyHPkhlOn7W?VRb0ZZF2+W z(4J)uTI9J|l64ZqHmX#+d&-@Z4SI!n6>Y<{jt=LD=CZ+EHEzE&7A{9+Zh(OgD3^fn z-YByL+hSD3og&Hbu(k-^+8EC-X&68GYB%`Rmz3Fs^XCV+QYbg@n;Y!7h5xRhHhG6H zFQMBhwiSrc{fyBkQJ1Za)yX&f-(AKIcL_Gb^q1N@8x#1-rie&_IkvQ}y1AxSjdx`) z6mdsN62HG`7JkBCZ@LKgQQ4jsCV?~%kRX*O^SPrrDd=(0OOhe(SP`*E$ueG+n}+gv zTp7$c-ePbJA12;WALnP9V{k~EQ<%nQFMb)1%KEr;$s8&yUTDb;dQtdF@~lLlWFH93 z1`7hS!Gb^;xT|#nK1*dyF&|jkYs??BY!vr6va;S0RYxPm%*j3~X~@D-&(0Zfv7 zAHbB=2QX!jQ8N2jfEhkAO8GKMp>6ApDD7!W#d2PBc?^HGBapw>HbsJ5VvXDjEwr-g z1wcuvd;nBd9{`m>0yO(r02)3LV3h>e?R>(B*0T1r@o%mbnH;u?9BQv^vNw<JQZ)E*OhO`*I!; zJ73YAsweM#_QJs@NtuNW{KoE-=z^S?bMj~A7tGFYoiSt1oSZy=K&0!znYB{}Pj{bY z(Gl&P&aPFhVovYf0x2t&*b;c~x`<$1*;P$Gn7D2$dU9b#AoxL^4r5?!05B-f!C!H+ zbbO=%0LLJ5_u3V>Qlyg+-5T-a!wGQEm zt<@nyarHVxDy~6?D8)7DFkW$sb%<8nQXOIxw_Jx<#a*I9oZ?z^h*#W79VRI5G93~W zw@QaZm>A%pCvMka60yXs)*(r8m+LTDaa}r0QCyD>$%M%`lZXHq-w_b-- z#a*F8n&LLCYsn-n% zft@{_?uFu2_vvt>Qtw32gnBXE&UCm*DLF#0QL$Iom6lZ7HMoUTqJYj8*S~DK@c6^6 zJg`4E=-Y665ZngeLCB#6mBPFGgQEV2oGn)%4ems~w=yzagFOht*O#V>8hh*Vx>_3k z9)zGqx+}FVtgu%vXw=|){8)c%^nD}F-n)wi5AaX=;0N@avV31yQCm{2 z!6OJEBe$(4`_d*29_5SH$8--Ogc}ywp|P&Hp_H&Zh7f1yn;WWI%S&n(RMTZ{VM%FI zUBfaB_9H}AG`3ch)z&rGTd7EV}5#l zROM46kJV(asjn_+veP5~1g#ej4Sq`4YwIXT4R-RWqq~C!KcjJt+kyr^=XC?|(Z?v< zmc6UN^J;%*di>!90;P7Y2FFoelr{Jz#oKiI*5KDPhUKoV!Eb0L~{9JT^hViLyK!i zYi)DQ#UhNS5VGaEO6=7t{ozjpQ`P%kk3Un`yf2vU!Wz6!aO5EJZmhvy$iwJlXwL8x zSCr%5_{0t4!#_gsORY$w^pFex2!xN}6JE9dc;{Nt_XRkko5+KvCj*iYA>K0D#irzrKv#y~OTfuOGlc>+GRG>XhEsX< zrsRMWOcmxdd8@{-a?rLX;tjZ$Et5W<7pBtute? z;h%RjED3}c>6zDTjxAb1V7mJ{vU*(Nl+|z{&EXWWq)%LRU8_jyaJq?EEW)c}g;*Ew zVkHfLmHhDL^og}fQ%B=8y83(DoD1p1h9t_l;@7sc!GJ9Z=$S|?6B%6ooo@W4N znx3&AzL}o6A9kfr-w!vB^bMDRuAxe#ma2?8svGL551o5z1o}bKMl#@|=^5eQdK~Ux za2R&ee8D$-?wN=N%N3JV<*kS z7LBKjRC_I|3ex=0qNyUyK8vP?G(#3m9cd0&G>b@c(4uK1&5taaW)G>Jw5XPl=CDPx zj5JSMG%HAR#G<*BG|yNxt)w|>(Ktx+tVPq7?#T#$&Z2UTyykYQ)c}^#@>oU%)p96+ z6;Mw1lI3tIeI;+9n@lV0gq3hNIA9-K2G2kn{1#SGa&y9`(2gO{fs)ngPwz!=JVng& z)J{@+o7x#_=P7#xP>Z5Ag<2N1In>IiHB(zjZ4I@1sqLfo8nySSeMCv0CSxJgXz{XS zYT48ZsoAO3Q(Hl;of>_gW!q_fwv*a!Y7bF6NbM-K6V%?Kc9sysA^3Qi-+uVC<~~+w z;^&$88G^SdpJ^t2oJk*I(lbNvp+WI)>HEMjgm4%cN$;dbpx+Q`#J)mopkiMlpH}Ik zli>(S6<%qG+(MMwgNIOGwjall&s~QwY#CW1$Z`Oq_hVcHP8h;T)YUVDNr&O%Ax!od zx(J*`Ze$(8bn5FIaUyAnF;eE}k(Maf-j12nvCaD^i8Otd0v17Rj$$=pXGj*#dx+0d z{8?fP6nl!;*@}Ic*h0k~C$>nj&k#FLv4@DgNU?i~y;!l|BOHB0SSmvbx02NFmA+2W z1}W(^p8M#`+y~uWV>d}#yizMkE-Be-?xSOT9}IY!H$})j6b1%^Pm&Y+KhsCt)zfHU6J8%H*q)l-b9D(oB#`qo;P7l!L_&&T$hxXg> z2)qM>v`O~SUOPY=h3-If-3fpvQHQ5#!~6te=*}_)j^Z?UjyBHom`m4?Iq(t|!3o+x zzrjknP&C8KxD;MT&q}&1w9z$S4g3*%sLr|<{)`V$1-}nY<9_&%cGfw36F#Qh^$$D^ z7ifolhM%B~+0c)TMU91E01Lxl7Kj9@7k&9X6u&ASmizeaiG>vSW#fj(4xlXA&TltMVXgSWyNyp7Vv9dI7$s}%0R0K6M@ zyceVJK8(Q!>8|?_PQ$&Jg^yw`dLE-Y<`5R)K`g^VScyNzW;~2b@d&QOpJE&S9M|Bp z*n_{IAzr`-@Rzs`e}((;xA+>K#5eI3d>>!M)5Lv*f1u2CiZatXl$qY6%=A8GrZbe8 z&QfOj8)c@yQ)c>vGSjDQ2BVsQAuINRAwLWaHQh7Rp*!Bx`3;tdqqu zH;ZEfERk(z6WIo29WmY&v_0WwA$S$b)PqdxFhkN7-z4j1{pHteBl- zCG0JBF+0T;va_s=onuvWH>$STSiLQXEd>u^%@?Gm|4L?}`sZISn!du!)!jTMb887d+3p;YGF%PO@HjnXQMn*#Nx5Ho+OT89roN;XK=hKs81Hy9PZv`vyj_ z>!@0}5ov2vg>o}yv0JDp`8LjBw__0%AZ6@MDn9PPX7*hwIPS-l>;Wn=et>J(!`Q=q zi1)HVe1Pr8ee3}4XFtN%s6cs>Jw^HFX*|uI!H?L_DDNDjpPQefRP!PWVaHh*`!%JO z6CO5!{f_d1?+xnC-EJv4?Eo>=D~|cF-2hp0LHUqqYg`m~9d} zVM}5sZByA>wxVh5lr5c|wPmn#wrm^Na%?tRo-N2$L`BmgDoN>Em>Z&6bMx{>{i@~W MNsAJB$FA}J1f!!!RR910 delta 11120 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 Qzsqq`y731tyKjy9H>T`b0{{R3 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml index ce877bbe9..84726c951 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml @@ -24,6 +24,7 @@ + @@ -46,7 +47,7 @@ - + @@ -54,7 +55,7 @@ - + @@ -62,7 +63,7 @@ - + @@ -129,77 +130,84 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + @@ -212,14 +220,14 @@ - + - + @@ -227,7 +235,7 @@ - + @@ -241,14 +249,14 @@ - + - + @@ -256,7 +264,7 @@ - + @@ -276,6 +284,14 @@ + + + + + + + +