From 40a529dbb637220705912e14681745c0a8646297 Mon Sep 17 00:00:00 2001 From: leonardo Date: Wed, 7 Oct 2015 20:21:41 +0000 Subject: [PATCH] bug #6702 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@48762 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...elatorioDepositos_subreport_es .properties | 1 + ...atorioDepositos_subreport_pt_BR.properties | 1 + .../templates/RelatorioDepositos.jasper | Bin 33129 -> 34087 bytes .../templates/RelatorioDepositos.jrxml | 84 +++++++++++------- .../RelatorioDepositos_subreport.jasper | Bin 25629 -> 27736 bytes .../RelatorioDepositos_subreport.jrxml | 47 +++++++--- web/WEB-INF/i3-label_es_MX.label | 3 +- web/WEB-INF/i3-label_pt_BR.label | 3 +- 8 files changed, 95 insertions(+), 44 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_subreport_es .properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_subreport_es .properties index 797224cff..dcefeeede 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_subreport_es .properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_subreport_es .properties @@ -17,3 +17,4 @@ header.de=de header.ate=até header.total=Valor header.usuario=Usuário +header.saldo=Saldo \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_subreport_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_subreport_pt_BR.properties index 960890c20..15a4ea8aa 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_subreport_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_subreport_pt_BR.properties @@ -17,3 +17,4 @@ header.de=de header.ate=até header.total=Valor header.usuario=Usuário +header.saldo=Saldo diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper index 8b193ad96c59dd91a369c3340a1013ddff8ccd41..97c1ec744048e34faa4c27241cda9a8e8b9edafd 100644 GIT binary patch delta 10245 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 SM?}qIqLZI6#_@`$BmNFi?g0@1 delta 9570 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 DI-N5s diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml index c90957d48..716f43a29 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml @@ -1,6 +1,6 @@ - + @@ -79,8 +79,14 @@ + + + + + + @@ -89,102 +95,120 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos_subreport.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos_subreport.jasper index 5babbf47b6b5593e8ceab114e211f16783d09a39..baddf3d836dfa1af10eb890080c7e0fc72e62d46 100644 GIT binary patch delta 8592 zcmds6dt6l4wO(srV1R=ngMxrC2nY-YwJ5kao;(-coC1DGA0=ELGuZl3}DC~deis~gUPrtoIKG3Y^6DU z*V&jMW@?O%S`2^zf|a39Pal1T9i7rqJKDi6q?*%Z3o>S5h?uZRRcK~5i#<8Q5B8FL7h*Wm^ zi;o_@kXsipJ=XYx=YR8aTV}8s$)bww%*m=;&k2cQAOutC4Z&18IMZTnjE<@5ph1f% zXbKL0fE`XtFW$;KZuUdCZIQ<<0$OSM62wi*$U=dw2={}r$>ywa_w_MMNML(&QxVva zl&NC!#W=Is=B)$YDhgY2^vcf5+wZK}qaSC7nDf=_eAeX3dw8d!xI4sXr8mTAr9+HX z8>1Vo>KHZJyJ@sH;drrBpQV}N2fW=Ky?iQ$Kddq$f2^~s$48^4PtHXHgt2Yb)TEms zs-vsl*Y5A??Qz1GVVjMquukAN)C9fup7m>IZR&?IW{b#~IIrK^*V)x>@Aj?r_4r3x zHS$*3J9Fo=rM79=VSTj(|aIdBC9e-noS;eLtBlz#kENW0F<-4Ce37n zSuwbe?YAVeUrb6i@)l%H9^|Gd_J>#{=?$?;(jit!8>3q#)j@Nw&&mCKl~|P}fqj-X zLjjR8ah!(a=SojQ$?Y%)Me$4sZqgfqn{)_n+87--)iH|OGi+;yjd?6{SzV5tunLvT zX--BIr$UgC-VkJ@Ly*zN=*Xy!QDjbuiAu~&U}rKa61XaE<9Tx9gk?_-PS`olQ53I* z;3&NzI7)}$sEyHaR2`!@z9t^ISjN>cKQlif0V!lF+c`F!1a5Es)S;v1PT3?6B5Oh5QL;R1R?1V zgtRd_LaJjFp(}z=du{?V=TxhN*5w2VeZdKd;#vqo(i?)1bO=J)7#$(iF^bSNLFkWp z32b9-Vg&F14rG0nlu&sm7Zme2-2?Wlm`DmoQ5c!6#+)weqY28GNQSlMVr`6;pc+H` zew#<9=yW=D%G;~d`^nrUqfuR}|pA7V(DJA8e;16}@Jt~i)UZTKPX7Vidc zLASSOO+k~tzpH1BXjj}3yV}>@>8;V-!_F5>94EZS4c_kFe%TVcUT~`+A$Uw-2MVtm zFq4fdo6L?(Ge?voWxb!Jc@o*>X~tBw<5IxdEK1{*t0K%&EIf0HXI06bAhyxo;BNG^Io;JZr(F(6J6h4H zv$x&b?UPRRz6tEd?g{KC#YW!vyTw`5)BniECzhm9rJ^JwLb7MO#-_2`N|FeCuq2&_ zpDf9s%6lbKcm+$RQl+5O!Yd7>GpMqoRIq%y)Z$Qki)rEQYU|*T&_)J-93YH`AWsYgKIo*wI9=FHl4Bmac zASFUwze{C1#^37)oW>Jl&<|ln1;X6Hwv=x+L=LdHIpP4CIek@F>H^uoZoc{QZJOV+ zSDfVV5q5B9!{jIEEY)C}XXlO^gZW_#_b~G;I|aASawR_*DvD#zv6p96QqY&PoXLDc z8r75x^3CQ!kIi;xQMVD*Zs($U*XU>fwc`nu)8ZcynQ!#>`n}zJyTB*eUkj1~VlLEC z1>^k?>2iDKJ6!X)7x=+2YWQGi6xa&n50`JFrKWfNs%~Gd1P%H*AC4SX&>_N_z1{15 zxp|hGEYcP3cYeNXWLXsaD{oX3*M(lmx>$73z9guDT(4$oV|02Y z9b!z{6B=Hp(eT7HvW2w?c%A*UCLgacwBN576n;1Z_;R4Vnr(CB1Po({kSro43++3M z>K#o_=WuIIhdPIrtm?RdY&dlu$!crU40L&}E}7k4YZO#1$qElOL<_d7SFaXB5^E%8 zGGIvIZc!wLATGTjh-)1>;#!A}xO9Xdp2*tgWf}~LI^u~u0Spt_!39$SQ@AOLtPm8X zHv~nkLq}2T&{33*8z@59Rznu+o}X%<%gEdwntxKcCQk5jg4tTftbn16Qx!!?2&&Q> zf~wY`qpEf2s7l8TRI{k_61l>%li=2?qMTeIjUj>UbQoF3g7!c)heS~rg0J+3;H!1$ z_-Y+GzS406Ux*?;obT3twrg4%OE()?f88vDAeqA6s2eh177I9&_~o0#gaQlAx9TsotuqNt**w5?)##q{Fxp{n{j4HL%qdHcO}R)qqw(wZ4iV2m_pD==1Ca}yL{kU72+@4*YrA~i9Rmt&*aGfHFmbrq+fSfhg6r{y z`)TAOu*bfbZrFuj4q{GQQxlyDZ8i2r6EI}wixR?3 zup8NjC8<^uJcN+oXlirJbGaMsZFGKdxNNfFZ&LEggO>^RBC9M(tTMsA5rXx$#ckE@ zMK0=Z{|M@_*EcwA9($7s4$>Gk4~PjKV;PH5#y){yT;=U)?=`_w2vgNLjHwgr6bauZ zw>V^*;NNLZb*FI?JWFkAj`SutLI6K?wYe76-^_>j9718RO}4MWv@#Ngs2zDk8jd=S zpaf?~j^QMwi)ct4(SY#RG1FGtAaJKkxgrI3ip4J4KyL!j=!wsD8gm5#W4kBWp}Q$CJ7H#J_rFA}cM zPljh&lFYvy;U<2DGr_0qVoO@=f64jy10T>ISlD7~`ky&+46f0lH1)3UZ}-)9b^Ay# z45XR>>CCx!Um$`k1J@mKCD9RAk{od*!4X%I8*wGE5m%BLaV4Pv4$62&ruM5v(O{F@G$Maa%!B)}O}67;|@#F4p#d_#xW2zgM4R1@;B4zUxmM~BQK#*5)KdWpJ7?klhq{sPNz3@k?rtiWPu!x~tL&EUmOSVc=p+mxCl z>*NvxAJWq*lS60W&~aEq$TK>mg^4c3R^voq&(Y+HQ^iL|R*{@xPQ-zcv0prPWC{ zFA{D4hGGLtsJe8x>ZDq$s9h!J9IB1bm_{|VSMp7^#{W(>m_&G&VDlE?(bo9SI6n0# zO{x^c7x;g1z}>Vm_dqAyOL=}D<=ReKv0V_j9d^SYJV?+Uvi8Emq?iZc06b2A&%zUM z6uu3oXvcgJ4%2!bfpaiK>vas?h39F_PSGRvU0S!7Fao|uYxfGq!Rxes=P((5L~Hma zX2Ato$G7NldzaSoXIKUA(|Ue@F4_-U;o}Be2EU|*{T1Fqd(}F)NF_LO!%@tGQ)q=3u>fAB^f-ql z@HUoGid4WCI0OEIl^BL|FamGJSggi4oQH`xACu9E8CZ{5xDX4m5sR^zB3rNumtq|* zLl>^ZR`gO*p%2&KYP^O1*5TLCkG&YcKD>jhLEJ(~^{4+=N%aqu>c9V)q@uR9Nu^f* z7fQu@4V6@ce`QjUQXwf7l2Rcl6_QdRS1Kf>LQ*Our9x6FB&9-9DkP;sQYs{+LQ*Ou zr9x6FB&9-9DkP;sQYs{+LQ*Our9x6FB&9-9DkP;sQYs{+LQ*Our9x6FB&9-9DkP=C zkE~6{$SVq5el&3aUQwNAeID0HnkC-o@o%HEbt5}^0y?Q= z_4nBbKvvP@sNl};wYUAq5PCc8D!GBcSn3lV=G)TJ-U_Mo!h})O99|S%zYyAi7js(L zm|XyHqO=8n`W*H2c(`t)2oy194>7g~ov(tEg8lB=!?D^;jvY7LEfW`A-wFf@J%lQb?10N-Z@lj&j_^f7pXnJ%I z-5WE}olVf_UN#+!4KE(^z(#mE8)152qr@;aN{kzu$2gnKF+nse))2%+h0Ei%cq?Oj zSv|#A@nVYyR>I3!3DW~BC5Ew5V%%75;jDaPgXn`};(SLlRkhRggGN%P&bRZ*7#$(| zQBwwG*$y&Fyy)~mNq9LWVS1pX#4t)qj2op+E~7wtOK;(WhtYX)y>s#kBfyIu4+Mml z6A-2c0!j=cpv1Tl=;3qnoj!;*#pfs#&cydpIL|2X;;aV>!pkWL(*p%1hEY&r+$fyo z6e{C`=vxUPR0;~DHzUFcp|hih_elr(_dQ#qFltEb<#>&8Leg0Oa3&izrsI#{;w>3DL`8n~85_C%p$6^BK z+H2?8a_@|Cz`*&o#kRynj)um>T${t*-@<3Ht+BaP^hYPA-mlU19@g|m>R)_;4dS4- z;t2X>nvTd+N*|?xZ)jY4Xt+#}CXPAPSYk0*Ypf=V*;*=k{)Wy@PjxB*LxiU$$6Qoo z$|=n^7b!ukYtV6KZ3`O{bDEo)?6r=D<|ghZO7p==^Frec?4qowcL?5k2yfkJYpPGo zZ*th{?XCT7sV-wUh28goZqB{|l7OKE{g)mIW-l^Q{JW`y8p9?J-2P2bB1$I90k zQLHlD5RH{dhHzG?Hbh`$g@Mn;HbWLxE*nNN&v%AVSc%9S%_@1B@scuj5G^hZ3UK*! z`gw2!?aE}sozLW*ev%o9m4R6yX=2`8m#v_oO}sQWg~B(h6MWFuS?A(QXs-kL;_)JrX?20VEl&mZ&8T@U|Eyo0#Ly;C2Q!(hZYL z7<_S3QP@&XQ4Cu{CmHX>pmt+H*vfw$^dS$5$~H&iu)aCwg0jLQ_hB#k*47`o2b))Ho+^E3=3XDa$B{@cmiDxWHETnUN?u&%( z9+li_&YMi=2cyPxZk@bVqk+rx)A-18a*TD$i*B(3uE~tz6^=ZY3`XT}O>Gnhy^yF2 z63zEO~Ls z154rcz|z&BVksP)r7+!DUZRT%@6wPAZEC<(6zO0EtS zCE?(dgy~M{BiddRt|1?}QtB@1lDl{^%i_ry>NJllCtow07hicGC%hiWxjIzjgoBaG z6s9}5uf(E>UVC#{B2dQW3%b212$$Q3F1FML_#mWV1>)~d(-}nFof41H_y~t9CB;F9 zSahMHu{)(N=*;3e4UTZU_?!m5r5)B`?6un(L#pWo>o8vG=q+ooJoMb@+eeO~{u1Fs z8c`BGG$lPFB`qV(kWrI)PbQjvKnTRsg+Ae(juM-u^OLeNLQBerI%8n8KX}6!8GOKZ z0BArjgP*YCWsroGD8m3@CClJ1th;3h5LT)Tvar%+2o#n+5RSQBIz zA}r@58MMO8mO&@1Tp5Cdl_x{6u%^f`R9I7G2oY9+48w#~Bts~KG5Qu6h6~FoL%6U? zWf&o>=`uvXNESCkhDfyH(X5nVlmM$_h!R${40j1@whYn2nnQQaxWBR<=J{iz1_J&K zO%0B`276;&n+*2}xRHRw;OVwj1e*ldOdwE62MWwN#sZTB3lU;TKoU!Ck_v4te$Ymj zSEK|ig2e&gfF%Ty*=o`8(*x+Wih$r{*g%!CNU)sHj;x>r304s3O*cyO3r#hZ<{})z zNg$vEbDNsHd{aSgi3F<%@Y_68f;Igu`jQF>eoPxH!xA1M;GX+P@Gyaa{V7qYX-268 zKOywGA$WoWj}p)-&Rk=uv8KdaX3aqkj}Zt{@G@&b%@n+Q3NY!)Gv<_U@z*1cfylG3HD=z(nvu%krltqB{)d;R81Ls z1Q&#Bg(ZwhO2X&|-2}YHs(J*$wr% z_S%L8wnjhr4URa^ZmYAmCMwf%lD;}CMLGqinXuoWw`PTeoh6`Cg6eFJzT8}b^E9zK zH01)$cR!^PM{7e(kxBjpP$94iu7k;IA=R?w{3%L4af z6oEP{+hHU)l2o;F@N`=fsWSNoPbfZYkEgu^FIRYXK~LdMc+bT?=VHIYY%dXW$OYf! zf$!Z_b9GL2hQFGSP2{9VR#bJ&F}#TaMoXioA5f${3$$4&*JQ#!yWP#uE5(Q9NxuM zxJdMHg`~k%V!)$*BK!%dzV{yr;9=Cj-|B|^Pif%lzoh|e<)Q(lrf2|bE*en!S2S?# zhcs{#HSi^B;P0q`f1n0#p$2Y)gJ>{u^n#Vd4|6*S))5)=u0YsChG1f(g=ff6c!7k# zJ~A8*;{tY*NH|GG!D$i$7x2n_2N&})iGyn-32qQ)GJH%@;WJ#_n7yPy=gG1M5%&kD>-TPy-uK0~=8T zPof4kqXxF12DYIFs_rXiLk%224ID%b97YWsK@A*54ID!a koInk{fg1P#4=c>V91vWSlA4-&=ijdmdOak9W;YJ~CxLnR2mk;8 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos_subreport.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos_subreport.jrxml index 628aff699..7e90bcc24 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos_subreport.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos_subreport.jrxml @@ -1,5 +1,5 @@ - + @@ -13,6 +13,7 @@ + @@ -20,31 +21,34 @@ + + + - + - + - + - + - + @@ -53,7 +57,7 @@ - + @@ -76,7 +80,7 @@ - + @@ -85,19 +89,38 @@ - + - + - - + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 21b75f367..60f452507 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -5723,4 +5723,5 @@ editarItemDescontoController.MSG.borrarOK = Elemento de Descuento se eliminó ex relatorioDepositosController.window.title=Fechamento Cnt Corrente / Depósitos relatorioDepositosController.lbDatInicial.value=Data Inicial relatorioDepositosController.lbDatFinal.value=Data Final -relatorioDepositosController.lbPuntoventa.value=Ponto de Venda \ No newline at end of file +relatorioDepositosController.lbPuntoventa.value=Ponto de Venda +relatorioDepositosController.lbEmpresa.value=Empresa \ No newline at end of file diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 77ea73113..a1d1b6187 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -5865,4 +5865,5 @@ editarItemDescontoController.MSG.borrarOK = Item Desconto excluido com Sucesso. relatorioDepositosController.window.title=Fechamento Cnt Corrente / Depósitos relatorioDepositosController.lbDatInicial.value=Data Inicial relatorioDepositosController.lbDatFinal.value=Data Final -relatorioDepositosController.lbPuntoventa.value=Ponto de Venda \ No newline at end of file +relatorioDepositosController.lbPuntoventa.value=Ponto de Venda +relatorioDepositosController.lbEmpresa.value=Empresa \ No newline at end of file