From 3276e48111a4a439d6d64edc96a93164b33e59b8 Mon Sep 17 00:00:00 2001 From: aristides Date: Tue, 26 Apr 2022 19:24:29 +0000 Subject: [PATCH] fixes bug#24378 qua: dev: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@112026 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioDepositos.java | 7 +++++-- .../RelatorioDepositos_pt_BR.properties | 4 ++-- .../templates/RelatorioDepositos.jasper | Bin 44357 -> 44365 bytes .../templates/RelatorioDepositos.jrxml | 16 ++++++++-------- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java index 7d767820f..83ebc5866 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java @@ -73,10 +73,13 @@ public class RelatorioDepositos extends Relatorio { deposito.setDtmotivo(rs.getDate("dtmotivo")); deposito.setSaldo(rs.getBigDecimal("saldo").multiply(BigDecimal.valueOf(-1))); deposito.setVrdeposito(rs.getBigDecimal("vrdeposito")); + BigDecimal vlrBoleto=rs.getBigDecimal("vlrBoleto"); + deposito.setVrdeposito(deposito.getVrdeposito().add(vlrBoleto)); deposito.setVrfechamento(rs.getBigDecimal("vrfechamento")); deposito.setEmpresaId(rs.getInt("empresaId")); deposito.setPuntoventaId(rs.getInt("puntoventaId")); - BigDecimal vlrBoleto=rs.getBigDecimal("vlrBoleto"); + + if (! filtrarPendentes){ deposito.setNumdeposito(rs.getString("numdeposito")); } @@ -111,7 +114,7 @@ public class RelatorioDepositos extends Relatorio { dtMotivo = deposito.getDtmotivo(); } - pendente = pendente.subtract(deposito.getVrdeposito()).subtract(vlrBoleto); + pendente = pendente.subtract(deposito.getVrdeposito()); deposito.setVrpendente(pendente); lsDadosRelatorio.add(deposito); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_pt_BR.properties index aba860115..3af9239cc 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_pt_BR.properties @@ -14,8 +14,8 @@ header.data=Per header.agencia=Agência header.dtmotivo=Data Fechamento header.saldo=Pendente -header.vrdeposito=Vr. Depósito -header.vrfechamento=Vr. Fechamento +header.vrdeposito=Depósito/Boleto +header.vrfechamento=Fechamento header.usuario=Usuário header.numdeposito=Num. Depósito header.numeroAgencia=Número diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper index 75faa2ab60e6b308bbaf33ef48032dc71ab270ae..643a8c8a01da1a1128399b89fc3573293d6b3166 100644 GIT binary patch delta 5442 zcmai&ZERE58OQH&5(h8^f@237=d~v5NXSb`vLq0iK%6#RAc<{4M+3o0++bqIj&q$h zEF@5=+q4Z@IMr6RcI`e)Lui{i`5WC@DmE3dF=^_T6+t207@agtWK*>v@v`$g&$-TZ zId1NUN6)?g=jC_K%{}MDzrSL+e8uw4&#Q7Kv{~&t{A|_fmD&UF(cI%bn+i+igV-cI z@71&m{+PH@K@a#(I}3AV5TCDbS*ZZ8^EfQpJw9LT;s>I6$+gwDv#X0^y0&aYk3{v* zR1^xbGEqy{RvijV1*#KzC|unU(1X~E74zE71+0uO^cNN|$h3_|BSXPREFPQ;P%>yv z)K*NzM}o2FWJs5F`9gi63!@-)pV_2Y`g@X{Muee0A3%xz^&3@BfPw+ z&#gm$G;u|LQn9~up+C8b{xSyo$Bq8Uiso#_j`GSD&Q9|8TRKGJ>@9=tH=r>Zu4qgu zHkPhv`~$$Tt#ac1MmMbZ)^XAeacI=JFV9Q%WRyV>?`JN zLpgl^_V3$1gSKd{iv`DJrF(27U07i#;xn&zNqcIBkHAHQ0+fF?y|y z;X?bOOzmC#=FiHsUZYP4akO1DoL&`pOGw=YM2z=ie!ICP=r;obo;@La%xsBD~jIEbgP;65+q% zEm{Mq(C23|p8rNjkWeoI@_a?YukmdW{+RF44b*4NVxR8la3D+*VwqtK&L2*Gf6mFz z`>Z1KL!Vn@{u8UL@E0$WAr3w<=g7r|BB`VTyh@gM_tAt;& zyG;1)yPJjo&E3FudUt7;tZMW1c>RN&U7qd^pR6s$mUbZO4o&KEoCIs_?CSP=yavkg zzH;vFw~Ojc{V)q~e;Dsi^h4)&`iq42r~Y!`FZ8<#W|#&YmWlIFXJ|YSHtGmX#I^6S zQ=FCJc;2_2slka-#WH=h9@PWk&eWMIRi(br3NMkBC2#Nf9SeV|YdLyI4+r7JUe~p? zb=8|U*VUS?Mo|8$Yb#=b(csg;z(_C-PyQwjZNt%UA~L@C?1rwfS`h!PYuS1{fko%V zL#%N#S-N+Qu{+7PpA)AHjX!v;+23yX zN!#FRCLR?Y*dfj+fx${R6=!wuR}LH(AwBi$)@vs;?S+47;sT`-|JKLEorC8!+WGy* zSMg|I7wh2f1-h{4I$k=ok4^L5#wvbxDBm$5-mSPqviVE>Xvou=fP!cyaVFEgR1y*- znD-DV@P!F`F;$=#^S4Pce7?zP$(l@kjei)PXBlul2v)O~`R(BU94C~x_nzO`dJ1sS zysE$@Re?(a;Fg$U(r{%A{P&Rcs=>?ejqb^S6FRsNk8c&NZvhmVHx*E%DxgR}D0562 zl#D^BH&alN&_D*LPeKONF8~V7Sp^iS3Mdi~${dphC1VikEJFSH&`TMB4vrZ>zXc#P z?<#;uRREEIK<1br%XF&N&)OcP003bBC6hNdZfJi_f zb4(hLj6tAVsrk7Yi)Vluo-m;P3s7i2S3r@ffFc2*%rR+DG6tbOPeF~wdvaFK#CM*|tjFRyidNHB;`+KqAZF((7qEdzkJ|<^n&l6VfCL+_J8W;F zK#DP+g=7o~<`JZlJ&x+^_J7;M}Fm@q{KUdUjkA{QdR|)=BsDQsco$Wp* zMzZ86zN>rO4j2U*yJ8fi;wZ>fjKVCWjlxJ4%W$?m^&VbIw0+6Umo7E)cM~4>W5A52 zOuf*G=?Exw@I}}u; zA{Ds`DzlJAWh4XD4r3;h=MNuYtekI~SugCfGaJ|~K0C8c*dNY(wWaaW{d4b$ W7 zVp@ea7!K&scql49KKiL}u&%M8wz;{vp|-JkbHiYLQ(b*st|m^8ReU1H#e2V%n=C$Z OwI)Ab5y)5nvhn|pLfe=C delta 5331 zcma)=TWnOv8OP78%^FyPZFaqONJPl^0X1qGDz#M_MNMk;r9r3`%>xNUrE2?Nr35!^Li>@uf51Xl9rZ{|Pq{eNf9ZFaA%*xp^Sz4eP)+Fn&b-R)cGXHR(O=e5IyM443y});|K#^nB@JbL z*oY;JNG8FH5ihG_D4UOI8O=9mM54ZK&CtPz@WGqoiP&UvE^Z_;dfd=(3hnoM++1~V zRgWc8dRmf7xwJ8p3hT*4I${VPdVRFIj4Oqi)U-ZzREx2Kk|qky#r|&^^D5`lHpS;+ zRv@H`&iE^cmqS(Yfv%}UIC3P>8&4ZOk+>G0(jzGgx}+WtGXh;4()G~_y1D7!WRTuz zS|pQ{HYXfM`2s-*)0#cbA#7Wm1X&o9&yFlitQFY#ag#7VJ@hv%2bt^gq?71$`|csf z9QTHh25)Rzc*}yxTNX^-D1dhwE{(^Y%qQeDt!t&^WxCwj%@FKQO*nqc5g;sbgfO-( z5M;rGAPXi0A+T!?uIS0^)x1boE9*Xj8^=NVMPUcNe+y=I_g4g}#H0K&EfkSv&hWWfX^gf&3# zz)EGFUJ@&{x1Fz4qWys5PaFoq2XN(J+X6-wOfa%wfvhwSZq@M>Z$h|@#@JzDi~<^Gb7m}3X6(Mrs+&H%_80W@eh>YA z;NZg$ZRk-QMQoN0LLm@gUbL1-2#m;M$4PW`XGKA_n?23TY=tHs*0_hX>zVO~L0W!B zb<}Vq2$hJ09TrF^0Fp=nN#uZ3d4Hr&_l-Rm>6oLD<3OlK9PF^bK>=_?3OFJMocjCW zq#umprjLDFbp$vLgigf44htL<07s;NBXYp$ydRE-_V*on7^IK-RL3Ysf}kQ2c32>x z07xPQB#{FW>>gw+R$N@x>-xjwhIkJx^aoDyH<%5=GzL;2KxI0U25+@e|F$(u!_vnbHS~}e7D5u zeg=|lo?c>-msRpti7LgS%5Yb(cTnvM&kuXDM=|hxc|q3a%J6nJ zfH_6b^1z zd)1M?fvhc)He@9iO)j|T*-?Aj13a)&k&!U8XisjdnJvlop~SoN`RMP-sgDh1oe?pj zI={$o8p@UiUt?oKz4U43%HP>`HmM!a_vu<#Pw}3Aux;#AB03j~-|Jg76jIN{PYosC zNX;0Y93lqz!ck&Q)efPSUl4=4;+(0LB7R> zKue-dJ5GkLA$bPe$JeG-NzU)G?khNx&-~c^-b;y;SF%bwuP%Km|Rf+SCNA28_cze{^i)Ioa?cfoa-g-3gIHSV%x%1 z7EG=vfU8Ks^&)dUlXLtqdcg5Mw}Nm5tgvliB?~4i6u?TPV08tS^~2bF&MqDgI{wP- zAgq8Lwk_;r!DNR5*ohSER=_Tu2%dQ2u&x7mud{p+epPVIyM6TL=^i*YcVKnO6w(LdI#w((ruA-^jj^ zJhHJ{PhMVvUmfU$NSW)`3{7W$7HEq`Amrv~5L^~$s9K=Of(Z=;Kocon%6u0rAh#?NyWB4WlLCNzs~7KS0a{-M0NHf zp2jf9HadB72f0NroOIgLti#6B$Nequ-TCb$cCLNoWuiP9)T5e_NJSFt-oYR2CK{R> opKPjc+TGmP-1M!9W`9F{!_rqL?e%4)R#JmOhrUrsTi$g44=SRg+yDRo diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml index 92681cef4..146bba141 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml @@ -2,7 +2,7 @@ - + @@ -403,42 +403,42 @@ - + - + - + - + - + - + - +