From 2f5b0950116e3c5d0700e1f98f5ebc63dd22132f Mon Sep 17 00:00:00 2001 From: "igor.rodrigo" Date: Thu, 22 Oct 2015 18:19:42 +0000 Subject: [PATCH] =?UTF-8?q?fixes=20bug=206555=20-=20Adi=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20campos=20de=20novos=20campos=20e=20inclus=C3=A3o=20de=20quer?= =?UTF-8?q?y=20para=20busca=20de=20devolu=C3=A7=C3=B5es=20OCD?= 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@49329 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioCancelamentoVendaCartao.java | 35 ++++++- ...torioCancelamentoVendaCartao_es.properties | 7 +- ...ioCancelamentoVendaCartao_pt_BR.properties | 6 +- .../RelatorioCancelamentoVendaCartao.jasper | Bin 35186 -> 37245 bytes .../RelatorioCancelamentoVendaCartao.jrxml | 90 ++++++++++++------ 5 files changed, 99 insertions(+), 39 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java index 1498ca1aa..279e27001 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java @@ -37,13 +37,15 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { while (rset.next()) { Map dataResult = new HashMap(); dataResult.put("estabelecimento", rset.getString("nombpuntoventa")); - dataResult.put("cartao", rset.getString("numtarjeta")); + dataResult.put("cartao", rset.getString("numtarjeta").replace('*', ' ').trim()); dataResult.put("datavenda", rset.getDate("fechorventa")); dataResult.put("valorvenda", rset.getBigDecimal("valor_venda")); dataResult.put("valorcancelar", rset.getBigDecimal("valor_cancelar")); dataResult.put("autorizacao", rset.getString("numautorizacion")); dataResult.put("motivo", rset.getString("descmotivo")); dataResult.put("numerositef", rset.getString("numsitef")); + dataResult.put("nsu", rset.getString("nsu")); + dataResult.put("numfoliosistema", rset.getString("numfoliosistema") != null ? rset.getString("numfoliosistema") : ""); this.dados.add(dataResult); } @@ -58,9 +60,9 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { private String getSql() { StringBuilder sql = new StringBuilder(); - sql.append(" select distinct c.caja_id, p.nombpuntoventa, ctj.numtarjeta, c.fechorventa, ptovta.numsitef,"); + 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 "); + 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(" 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 "); @@ -78,8 +80,31 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio { sql.append(" and p.puntoventa_id IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")"); } sql.append(" inner join ocd_param ocd on ocd.empresa_id = p.empresa_id "); - sql.append(" and p.empresa_id = ptovta.empresa_id "); - sql.append(" order by c.fechorventa "); + sql.append(" and p.empresa_id = ptovta.empresa_id )"); + + sql.append(" union "); + + 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)*(o.PENALIZACION/100)),'FM9999999.90') as valor_cancelar,"); + sql.append(" 'OCD' as descmotivo, ctj.numautorizacion numautorizacion, ctj.nsu, c.numfoliosistema"); + 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"); + sql.append(" inner join caja_tarjeta ctj on cdt.cajadetpago_id = ctj.cajadetpago_id"); + sql.append(" inner join punto_venta p on p.puntoventa_id = b.puntoventa_id"); + sql.append(" inner join ptovta_empresa ptovta on b.puntoventa_id = ptovta.puntoventa_id"); + if(parametros.get("EMPRESA_ID") != null){ + sql.append(" inner join empresa e on p.empresa_id = e.empresa_id and p.empresa_id = " + parametros.get("EMPRESA_ID") ); + } + sql.append(" inner join caja c on c.NUMOPERACION = b.NUMOPERACION"); + sql.append(" inner join caja_formapago cf on c.caja_id = cf.caja_id"); + sql.append(" and c.fechorventa >= :data_inicial and c.fechorventa <= :data_final "); + if (parametros.get("NUMPUNTOVENTA") != null) { + sql.append(" and p.puntoventa_id IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")"); + } + sql.append(" order by c.fechorventa )"); + return sql.toString(); } 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 bf178ba0a..93cef0cfb 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_es.properties @@ -14,9 +14,12 @@ cabecalho.filtros=Filtros: #Labels header label.Estabelecimento=Estabelecimento label.cartao=Cartão -label.data=Data +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.sitef=Sitef \ No newline at end of file +label.sitef=Sitef +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/internacionalizacao/RelatorioCancelamentoVendaCartao_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCancelamentoVendaCartao_pt_BR.properties index a9730a15c..86b8bf59e 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 @@ -14,9 +14,11 @@ cabecalho.filtros=Filtros: #Labels header label.Estabelecimento=Estabelecimento label.cartao=Cartão -label.data=Data +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.sitef=Sitef \ No newline at end of file +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 678f1abd2257fe0198a42f64c667c177170c49e5..94dd3e278683bae090e8368a0ff87f99a16ef35c 100644 GIT binary patch delta 11302 zcmcgy33!#o)jnqu$R+s#2?+^=kN~nI0kV(}8aF3BZCvyogD5xHXf zR|L26)uL70D^*<301;6^6t%W0sI{dPDlHVLA}y6_DQMrB`EGKrx%u1Y`R$*FnVfmg znK|z)-}%mb;oN3%>0z9_TWCF`f*tMn1Sxzf-ki{lu*lj zo%v8ga(miPlX z!-4!6NF-j8W)Y7*vf-YakIw9K<0mm^7rsCJyy-~F9C3Czts_;PX=#)4LZVkITJY1U zIBRAkMqQ;1wM}(*8?A5#P+%xEaE*7+Gv+H9l#MWL_nJ?_j{kpGC{eo<0X)rA1uwN`Q0VgT;G3P0|a zq8s-Miu+Tkkt4x`9{pOo*E~!P0 z0Btr*XKkEWIQBBA7f%=)7AZkh^))#sYNBpy%2htAs%;{>&&5)hoE|mE>I@csE6;ru zdv|)YSv4-x=*Fgf+z`PLicW&0qpEmCN4Epe@m2U93*9+E(Xnj0(TNA0Jo7;6q+Y${ z;%rVEB(N^eR-~FmX-UBx(b8h>&&~-;lU!7lqPXaG04}}?KQ3A!x%9Tg^ zi)7h!Tcjy!&rW4Un_|2}u8%x7jpI8>lt>b)x=NAI?EoZv6@DbNLXog+x{(W>qs@P2#bFCS%}MHmD8@6sb*S#lPLjv_h3v^;4U(Ix>J&HK4#3S<;m1uY)RD48 zb)@P#kJOl1k>;Ts&1Xy`e;sJeawl|d<66l`RcjO@-44LWSK-GBfD7Mk`;-3~BMUxnX1wL;C)vH@%V7=4$V zXV$0y^X%8uOX%xQF+0fit<7}#NH8@+X z5ul8b$}r~&cXMm~8fT5KPtByU*dOd^XzJlRq$n+>aZVsM49PO#o2Ms^Y+#-oznOi=~URGUZpXDg4P)pCxVGrDt zgf)vd@0#8p-F`Mb0o~r1o(TEW^dWX_5qXVsr8Bj`*;JQW)Z}*6xmtC9Yv}%Z%<6*N zirngQ$DFc!d-w5OxpMr~xkEzqm}$!E^SOiKy#%dMiXHj6#ohtTGr95T7Mgb%Xr<UKNj*2 z@`qX0bU=3I<}3%M0QLShRZ2C@QY7msv(?J2n-_ z?RcOd5tjQ3vLT-@7zR1kK4i#oCb%sWkn8eZyZ-xH`xcl8b@)EWgV)P zc}7ubZn4)A+89e4GN*h_uKysNDoL));hlnf9Qe8R%V$Jz!3;NXIvx^HfPGRY zGHRL|Rx~!vbUABXtx{d+rqC8=ovRD6%bu${pS)d#_Tc#QikFy6wCZz&E0R4Isjw*) zn=!?+hS#|%cvfzqT|SoIHeM&K7n&Q2?Y!80r?@n3Ss*KE)MnG)ICBHvwstY(6w} zs3Go^W2x#MbG;*~w{DxS%)@v5CYQGGUJJxM>g6=r96ReH zenMq|6K0PzOPBO949S7oHIdx%jIie<4^=&>c<8p`;T5Z*615nBhh=lTJf5G#`+ADG zw5-)~8B#t8la)RWN*}7)r+nzP^5GTXLyG}?ST@qfKIP+ziWSPoT;sKGPv_Utm8#xT zu5??u@``Y!#Q?4>8|msjxN5hi(q5U|-PLL7N>wM6E8SMEydqp_F@P(}M!GtoX7z`; zt1Wl8%nRV|qI9RKFO@spR_?qa+-Wg@JIhA8`%<}ke*RLplNs=&ssw9x>)}Hm(2yVl za*$!Zym(-u7WJUM7bvgI;U!VyeQkVCs%0ZH3i);+?->mWm1oq*}@pEn2DA$YBiY%(xXziD%O=7n>rZ!u(mrPkBX{c&d02*2wfQD8`8smL! z{AgH;Zs&PbyWO>&x!wHh(m|-h>PB*rnNc@T)luf6x&g*z+u!>7g_n^;r}9s<}C)$)5z__dq*`lqbs?brU! zlTI0-6ik^0^`hQ=NKm#xAzGSXkWEXI4C%=eN(-AhTKoMx>dusG1(+siL~FKJ2ZGFQ@CH=YNO47WWJoX z!d>5xR^n_4p&yyAG-ZVSn6`w`U3527x|y+jw3)uFk0*qF0&~CA+(!2?c~k1jqOyuP zxy40Q_A(pY&(tmNwb6r2VdY5at7jD1iwnwa^e|Jj#R(aoOf1VC#g%e^N4o|n&o3*Q zRS{BbudvZ$Y!00sJJ&`(V~VtT<~vGD?fDf&j#3*vfd%PGI&JhMQ{OJL3i~{a@ibGE z7c0&!FRw0kY~C@N144E86c8a?P52Rl{?$$c_wcb zYoiy;TU+9sFLn_x$(>i7@0e2xpD%Zz72f>ZM*Eoz#kQ!lD8DGT*hUAy*FVL!(Q9yG z<-<05oy~rE1N+(NP0-L6H5N_PO5K=nyu}?=onk_b{k+x3tj* z7)xJ2ZS)~J`&{*G^cyUx>a6aYHu^35Tt98}5nGqNoUX5{HaZ5>)#jF;ja@bMjjkql zvyDE+&@z{k8yC zb2fzV6mV*6t4nQa#^Qt1GRfI|OhauYFqgr3a_>)aK1StyGi_yx ztxzK~P3OuOPHJDhGMq~i@op6|YOCLf+3GhUw)#EJ`i)?%+6dM7Z6kzF%0N9HSIb+_ zpMk!e(qX=_YHxfB@1h%Jb(5^V|14BY|AYDoN-^(P{eWj0y+PCImv|2{{eW)P!%!B6 zQGb?78Ph?VQpR@B?J46r=!aeX`zw7hUfd;kDVO3k>p&m8F!Tr_nS#(Jel}%He{&Dr zBWOR}i+{T)2gp`0;!)5*X3_%G3-Rf75i#M)urKO}vAeaaNF3=(EFN`s~mfVD<}(+1vZ+?On7K$h&^XG9ZWj zkZXXv?}s!1`IR5i1mxEe@!(kMp<4hQ@iS@#@;g7o4dkdFvJ%Me{gBl_j{6~Nx|VZ1 zl2v>J!g8+0a$ZL{9$JI-ydLYh7VCKf)^i=!(}VTA5$m}g>vVBTyk%>sD& zqvhq~emc2})&e=@hpYo~+7G!A$ftgY=O#dB{2-qofn*kRH-hda(7hGAe;e4|4z_oI z&*yX&-2MWKV6@K3_!C?RIS4`QQ!W|&1b+VsTKO{?=aO%SOi!Pi$@xebz z*-49c(?9pqrIKy@PD=l8c5_gPXB)qk62-lwyp8w3=4xrfA!uz!Yi4I_E6n<6v(0-s zWPS&S!sh0^Y|MwIFEr0{{|+7y#j(42FuJbY&GGx`i`|@PK~X#mR#5Kdk?2}1Z9Lit z&8gN%qq~n(scCoij6%;Pom1%r_sNPFU4S@7i)SH@)8Yw;X<9r2F++>*K+N3jk@Kck zA!lp&d59CV_!PuRT6`Gd6#uQ->E;1T&PJCF;{rQdTE{SlAK33kyZ zcwA2NgLDRu%;)?xox@}EH$FmN;?envPa)wvi~P@Xj+rkYvAo2+MK2B!HVzXJY=|h1 z5Q8~VB=7(vb1@>B<3t7z7FnDqCi74+jYo(=9x1NmWKqT`Vh*Q@#hfN;I8!unmRQac z#af;uJUm5gkErA_xR3@wgcE31dwX8T}_lq-@&WbZu%Zf9w^a(RoONJQ_;*4c##Tlz*#Tl#B zW1QjTxE8k24qiojcr^mYS_F(6aBW{thxsN1i678Wz8QDoO$Y|J(r0`po#!7S0NjP= z{>L2b;h%6g-^&sF01xH|ak+bxNAgc`ZF?N|tS2~=pXRCj4Cit?7xPYb@bf&E_iz=z z#7p>PcJTq;%CDm58@!$0g!M1^Lw=i&@L@i|@9`yXFf%oIg2>+7sQz_5NFOK&in&$<^tl(*N8LUh$}^qC=v*!Ogturi^s(%u~Uo|9b$|)AjXP=B3&F3 z8RC7BEslvCk2o$a7pFxY;>?WyVw~wI%y_=ze5R*3(^Hs1{P|AvnV#ZIPhrL*)1Lo0 zpDFqe;*7NE9%p(AGai`PjRNFFyo=`HlOi}GsuJfT{`3W5Azvu6$w#7JH%|- zgPi(BQAr2!_v|;t0y-=f(g(<~j|wM!EL?P2ETzxHHFREFOJ9j*X3@gI!p-4g1#*h( zkVCBD1hEdegNKtm;(MGfzK^6~1CoSWI2VaRvACTbVl#39ldHrQUV_BICGO*`VkPU3 z^d!k#t;ElhXE2ZL$Q-|H;uf88GELH=j%G6lrx|$>hquGCqAUhs%uYQA6oF3sv2*=2lByO!QPmGk!W1-^t9xm|5CT z+fH-9{p+{GCK1bqv3qr-#2fmJ8u%M)WJ z>akvKp<^p;6MQ;3TOnT_6Vu0@d@3Cliq6xiQSz$Hsb`FZzkakFDd4Nfnl#yG%!pw6 zwz*keGjV))Z;O!XA{8M$?uL+4;q;cC+}k45L)*xvs(ykaWoF%I**+;s#%09H`D5eo zHj|eQkdI}C#m*%Xhd}G6Q$2NHY^SG&TEtX0SP|3XZiqP*E@E1tJZ0OQ=BdHTQx|0R zmak@&SpKnMY3jI65@RhAs>@U)^tc-mPKAqvRwxp-&1obu6^R*RW96*zGa?_hUe~F9 z*)x8Cfma4Lv|cV9mlB?15mViCMNE&oA?8%Lh-rl)X4{-bY&wYbmv>Bvl8#4W)W0fu_CC)-4JvtTm-d3#g#3pxGL_9 zs|n*{+e7`4k=a{EVHXo#<&xy9G& z?SgYHIJCy=_pb6a*4PT{>8GA6y{o)wZT`CYv>9H%Pdx=&)?ur>^-V1fbD5c&lwfHh zl&0F-SnaF#w%D6M8D}ZOy>0%cmb$gxY9}pCwxP*ix5`0QPiSmw@U=9x*7Em{UI6Q&v^xnO#~|p&z7O2J*6& z+6GZtQ(g?Z8XJAp{<@|{t+%H~+S7}3=3|MF&}OgVdX zLdZ$}+4)0YQk6ddCKu!nguEqx5acKFvmyVGp9HyIK{Dj21;Zix3Pz8#3B=lj^9qVQ z@Je}U(OgfN^N~{#O#S8S1r~`f3#=W?!X(J4g$ez&yB*O{RM+aa{UN=DF)%*r86bMj^D;)y+3nCPDM^t zK}kVwK~9mArh`ORh;EY)%!@sJOi& zuPBlyhxv&!aHxdgr=ZLhmPqfSm^pf^ z+(gd0McY(qg)?iq6wac`R>-533A{w5&8tx}GG1=4K}Upv(K42%-ULYN!@I%wcTv36>4jzjcaS$Ms1yh ztqgo`9D%&K_@EnLl-^MMHJj-O$k5ZfIzQMPrQ9#zn(coEpzT*&TDwxrh4& ziYVHugj;?7+@^-+x_Tdq1~2GvK=yAK+BahQnfP`RnX3)-k(Ri|Iv65CE@~KICO`Px ziM@{lOyjBY>W1O*V>2?d#!Z+wAv2?D%$SU<%<&<_j6(fr^Wcsn4H-dl^tqSI!{@#n zNTc*H3Z_hx&Y&KlBxtNjAzB(|lA)yuCWUHgl1X7&nru?ImZq9yYH7Mj5n9SIsi&55 zP3om3j|t*xkC`S#X(>=(QnVIlnG~a?Vv}OERBBRhEzL10PD|w`#cQe3qy#O^GpUc3 z7MRpmON&hEr==w(_199BNdvUxHEAFvh6eD&)g~oDgyb_RSxdDh4boDbNrSa?j!8qb z)L_z3Ej5`mOiSmQG+axqCXJwx)_QFwrD$ojNu#uMo=Ky%w9cf|5G`IH$NSeVyofFi z!>mh~!s;69{CRc0`Wh^DsfIT&85TSj*Bg^A*WeXQ5q3pgRGOPpufS6@quih^@=#l!_?x?oJMR_-ZI%CM>pSH(rqi!E2K^S#smklT zf|8sfgYIDJ*>xML@XW6;=uSCjRYJqvOwqPRO(-v|EXxI#dzt#$cx72pReny%j3QjN z@^W%3O3M})bU#yUL3vfd%#zYFPZg?IY-C-r4BEle!>Y7BWd=RObh02f=wX((=Enya zv`ZdY)w}SKuE(nI6wfZosqo;D_p z`8#Z@FPsJ)(C2YLV2e>0 zLT`bQuCF^S-hmf7-xsc)2EB)!)gtODYS0I;uqWBbpXBRn^7*ea@w~X`zcB@mC>S}{ zq%`_0j6S8$<;?SjjQf)Q9!A&G5qMsOv2{;NFZZ|9HP(jER|utQP_OpZpWT$!>}#oO zssa0Ba_e~+0s5A{vkuUIAY4u}$}#8%yriy^Vcp6?=tq~Wm4fq|TD%6G2&3ba$rN`g zhqKyNtnjsjFw$wHV-s&}U9U#3!9jRUaDJPwbcKv;8ze7W8)}@vJ;LZ~4w0MI_U)C% zpk8l25MdQ#%NL)3}O^H1#JGgNNXSY1n#lgNJoa zx1)|@S!3a))9I^1fMk$ zqOj7d`iK@iflDqvaOg8|tz8X!hW4qH-83eJcgpJaeGv}=U<#nWjYi1q zz%7Ajj4!11dJ<*XyGEvr+D*Sm8NHh>OG({LS9Z;dR;&u~{hWnwV-db~#h8O!u2&Ev zDF|cY2UA8x|8fsWLHp@?{M$)cKyGj$<5NZjqHlCT6Jhil7m^L+CKoaV$Sp2p8jxFE z$eBQHcOhp1+2%rK010e&L3x1gav}LZ?r|Z7K<;xPML-^KAtgW_bRn~WbhwZ*AUgvt zr~=S#7cv*f9v3nn$UYac5XfULWHFE@T*y)&Pr8t0K%UwYaK54CU9WisDh#4ZR4a2) z2F#=JG@tTm0sc&|km_j>it5F54J| zpjw_wXY<)q$7^XNZ=`ehW~%2M)Ib4Yeemt*dtb*6-41HMx5*ydPX~8W4UlJD$O<5b zT*%o#4!e+*Kwfkq^*~;BA^~ay^r{o0W+1P*kQN|+bRqsOSEb+_5VgTotKh2DaMc>P z>O44VEnKw@t~wvCx&W?f$H_n?V?XT%>uIf{xCpDiX|MkFetLT+tpf6{3t0o?eHXG8 z$cHZEd?0^zA?;l(Q6^%mOTlsjSY8H}mxJXM0noe>gg&B=LGCXw3C8FXD}x068FCQP z&UP;DcQ=0D2Celo80{vsyU=!`J&AT0?M<|g(T<`WM+yi>>y4I(mWnnR&4V@@?Mk#8 z(E?RuXD6ACHg0AwQL_9U$C1ACYAeGEJ%q7a4=Mlu(6xNV>n_LM`7x!T^zli zKHbH=Z77E0VFl$b?uWU3yKFEr^-4V8^o1%k=aUoZLrh$D@;T_$lo$>qDrWQy#$AzE>2VKq6Ul_J4aO*wWtvsMRNie zuIN*n5n%_vjsnJ@tX(6e@%)5!KhzR=N?< zx|!~!n-Q_M&?9s^qV~6RfC6_Sbnl{<=stw+{qzn!gb?n)0oaW&euR$EqX^~4@Ev^; z;ru(KwWkr%2RVTbA*`S0K`1{{>1EEK*AU*X^E6bB9(>;O>3xLx2V71cA=E$StLSeC z_fL5XeaQ#t?|cvi(kpa~UkjjodzZfF59m0;{{(-AI_GPYRo`+5pI}2UnH$B9Ia7lXK;Na6k>m6OCoP8O4SsL11CqJUFG1&oI|bMyI|WQ|r2u!V%kWDxd{ikmEL4Oy~As8V9%pZ_yRi0?Kq?t z;cQ-v3(N)%=gYV!Z{*(mOHSZToXFSmApRAn@(rB9zv0Qeg{SdW_VBHokN*^%&3AA) z-_2L@J$w~Ez&G*^SUk)Jcqbp^J^Ts>_VR1|IKRtJ@CW=9e*)EK{0vgSvq%Alkpf;o z3U~!6;8mo6KOzOZffVo#Qoy@N0Usg-{0S-GFGvA@MGE)~Dd2OYfFno&N09=)K??X5 zDc}dBfPWwb{3O~1iS;5_Y!qjRt3{~T91vmRCec%D6LClZ6aU{+KtPuPKU)e2*k!}d zl>!3x$GiI~VDi6^0xX;Vc?!V!v&w*fV+#1MtAGG3(uy5(1 zS&bDpi+FLHNEEk=L1Mc|5qFAIaj%#t?h}*6gCb8nBnreXQ6YAVd19YfE*=#=v0pTc zCq=9HJyO8aNCD3w1sp;O$aqm~7B6AhKOhCXgA_0YMHBvT;HTbInORw<{bAiNljjVS IwVUGp6FtSHjsO4v diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml index cbab826ae..73ad40856 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml @@ -22,6 +22,8 @@ + + @@ -129,123 +131,151 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + +