From ce20ac7f432070b5cd09f6dfeb6d9e90ed0eb629 Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 29 Oct 2015 12:49:18 +0000 Subject: [PATCH] bug #6669 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49577 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../templates/RelatorioCalculoComissao.jasper | Bin 51594 -> 50888 bytes .../templates/RelatorioCalculoComissao.jrxml | 6 +++--- .../RelatorioCalculoComissaoReceitas.jasper | Bin 51328 -> 51328 bytes .../BusquedaCalculoComissaoController.java | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCalculoComissao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCalculoComissao.jasper index 4709e77be86d6d4bf6f01e0535256c0ff03182e6..5e83fee50d291ecd039b053dd1defaf126b26c1c 100644 GIT binary patch delta 5153 zcmeH}eNa@_8OGoDEG{1l0s>YEDp8t2B`aSlj3yFigo={*t)PN@EQ(|3?s651!qsGI zYZKEXXG~h1m|$WxCK%Jrupq62NsUoDQ5$R~&cq~RoYBc>Yp{Mq(Z2WGv&+5N+xDN% zZhTA^cZab8-BoP}t&#z8=6^VGB+gCm!0m@ef0Ip~NV)#Y? z=-L86Hw1ujjR`;+Apqa#0KS6qNYn{@H5I+c*nOT=nMb!`eoeY+BNCe!P;cL6$gXbK zLb*)F8~D zAxa|@ai~O0ZG4!2P`xmKm|YV<9IYXWA;khwcP$W&h6&MVm=L8AikKn~JI+;OlX3g) znsl7OJJ(E>I-)KeXZo`03hgNf;?cJo=tJM-Ha!8a){o;W-OnU-DS(;Uf6T9dEz2n` zJADK0GYp&fsfPV5&&?lH#_-=MbMPPH%VW7#yK&x)Bq~W-^RyCd0@UFwAUVYYlVo=bAQ4uJOOnxIC@tYO=;9h7lHA zx@*B@G)!DZ!^9m|jZF+i7Hqm}!Dci}Y(~SxCXGeC@kDyvJvneZ}W|e=|Hd-&Yrty)`AG= zqb5T31=WdeZEA#kJby4TpY&u=LsEmqbG*{3{Bs!wnwqPq5#L zg4>Y8zuT5J?hf3If?Y6x5I4Agq2jHpUmXtjqo5ZCxW_*-j3G?po*^mxfd9dyFodCE z^?Idl-K4p74N5rL`Ir7wdqflt!APFcH98_%`{rJZ;RCNu@U80_5w0Eu8~p&D#gYdO z(7&g(8&98+RO_jlskTzRNTvNPqczY$^*+_dROhHJQuWhbq>7~)MKzHspQ?yzF;z8{ zhf1Z|PPK>X5P*tDuw);WcEk13FhAU+>k`BDV}|R=+O)7Y54XGF zcBvn}E7=EEC%gyc9dNG)ft30s$+DpQ8>v;Ag4<;Ng;Y}qVh`F#b&zTfs{N$a2Gved zN>DvZYE4kJlBx|VHz{{eRjDL51mz-9-k>V%#v!FNvrf!}`!R|rvS?ynkarxZ`rw8n zxuIroLk8VrK=`FNsVOwR3=Dn`P4Ehx>~3gLVGkYe>#z;>(Gl;59q=|yw?iAeOGo`j zy6T`GKXgGi9r>T&81&GwAB8h?bq+p+&*3B;e=l5uQxt*Ia0B`%24^u0KBFj{!(niq z;_wBg!Uc-N*XV>x6pPC^9j;I`uHu|x_?Gg~kIUdDW#kst!d=SA04j*6BEzT9j@vOD zpGODo!D!rzad?P+k$sp%(HV|MF&RI>u@pWB_w*$Em}g4F|H$)DQ=X-gd6r7%St^-l zsbrp|l6jV@s+`(Wo~4v|mdcQ4n)z>emKzLtmK*r0V<~DgW@aO}Xu(+@7V}enz=HN4Y&ux&4B2dx3KMHRbja<@Pe= z_6p_pD&_WD%56X8_9o@_7UlLX<#qt+T>xVl!(q&hqgXhmG6zm%(dcAxn9t&II!jWq zhz-YLmW+$p1GtQh!D^O@wJZ%i?5C)(@u;#1_!M*Eb~Xv0XF0fs<>FqJhlf}``q(3Q zgguH!*-ZR|6;p1tS2PBwKw^c(>y!f7^)AKPQ0rV<+2D40y)Ir59>b??j^r&TV*U+) C+E#u5 delta 5454 zcmchbdr;KZ701u{Ew2FT;tIYH0a4Kq5F|b@7^G@^MyrUT8)1b7F$nAK0xHU)PHJl! zN4>3o#F?lukyN8bHvva9n$c*L_?(zlGh^D(810NneN=4K*mEDd{VluW#6Rph_j=Af z_jkYN_q(5a_Q(GD9m5)C_+)T?Kh3cS>S3GagbveZ0YAw@ zENV$N);4Pno?z!k_FxMOW=EXi!lFAVgrzTpr5Qk2AMg=Y0YBlBbgx}m(djOU0D&Qx5mEC@$3;vCLWzJR!B)#ED;3uAd=x&Jwq%RVXW`G3r0iOg^z%PMYG68qU z+!s)0;2v1mikbn%=0{n0HiIn5*};^JL39SGyH&@p3NI7@733U!Zk~(V z=VmadhqGvAEQ^>o)00#EJWo!Yc}}7;2FOW91LPzFA}9SEpPW>{FDIier#UrI?03b} zJ$XGS_T&}M^AcTLfV^ZhKwdH+^3u=o$x8+N@`}^tb-6amZLkhCD57S}PsUNKe*VkK zKSTa#cia52A&~&0+Pw$#Vc65;T9^2%EVFrr!)kY!&GrRlwPy2};)-&c!x~>(Wq;FQ zvlLs+X0KUjDOp(Pv{zTYX*SnbE1i~kRTWlem4k-OW{17lY+higv6#)pRpi?j6jxO` zswEXUECH9IEaJ%M&F=WE#y__dPg9G{I+0l$s9FRI*QXO2o^R`ry=K|z#4VhWKHSwfxHTv2Q4 zE=Ng9UhMhy2mni%HX8tiRa1{H2*n@WZ9ACJp9NqDv1TC8I)0nOsVlTuPe$Qt9*%Ut+8-Ur7Zm z^KM%XR}|gI0E#jy6qU&pmB|&Q>906aDBfRIq!bq|_dLzlxuEDK1rU@`A*f6)s7x*> zO@F~j;%WZ6-t#oK)F)%U`((WldmMf>hnFOXtPP{y$j!wL%EEA%-E|ckUmiYmSo-jc zj3McTLxyGyAMQTAp;U8!wQ_$aEMjkM7#3*4ftb!k0CDF}{e0kaS}qm)A*9gTU3XJ@ zW@h^Z+35{i+}0h_k)7F@*|n?9Vz(@`I<59X{hK1&`-fcjsE?P2u+#gx#(s(rGIso= zyfM?lpb357Dc!gBt<_vBsIdS!unC?Z7`a$l zg{87AZMxH5URf537!IxQgke+npdf@1Y*BD5%W6u94ngQBW>-7QE7B&FJDi~y#%xXT zDdFK5iV+Ag?H9|fE-kg%L$L!wXpNsk7x-No&{sG>^$vt<_|JOLs^yyBmnpz#T)zlcZ z&D3^MYo>OT+F5GfQoBy=9$l+ZqXU6))KaKrQ5#1spIQkuJGBOCYpHFcb_~FU7dqdY z+=vw|aK9j^8U9UnkBb{l;9)^CJfh`s;HNN`j=>Ss zCO5j^F1fQkE__d35%=KXZoW_ZybabsBklD^un|6{{oX~R zduh-2!ER`xeQ$;X&_a8E5RTI$ItyRG1^AK}I1X3f6mifBH)-@9oP##_ns~T~!ElL~ zxQr&aLR@@@32>FzxQ1zPgZQ|K*>KB6ko<@f;SPav7Ym?`V0nOL@Q8qUjMa$PK<8`~ zhTvK{tLy2sZo^32jz&C2r|$$t;{`fN7wIhgfQf(@4?lqh|D@XsqT9R!835YTFn9eQ zIDZ=EE`suTbN)2UT^`Q+_;9W~#kukn=gL!@D^GE*JjJ>46z0lPm@Chv&boW&V%ff)T3XA{tK;W`!)#Kmxrm~F%P#A!JO<3eJy5>05wICNkF z)?x}S#xz`pS-2dtaRrXUl{gW9gZa1`T?P0ymf-KP4A;>m>k0WkVgqg@P1= zcRiod{);R7_-934WZeilv93BiPHdkdwp(Eho+Y%;5!zo9+7}7!ON91i zLi-A#{T-owmC(LMXx|{TZxY(K2<;yU?K_0_T|&E!(0)K@KO(drW3Yy3)HF0{AsDBH zVuBWdDOx0^X-3S_qA**FrfROm;6$wl=4(B%K - - + + @@ -257,7 +257,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCalculoComissaoReceitas.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCalculoComissaoReceitas.jasper index dedab63e6f0a4b24fce9d201b13a08a866a0d0fe..dc1c6ea741ff9957a8df430154f43d99ccc04da1 100644 GIT binary patch delta 87 zcmZpe$lNfIdBf!C;%0_MM#hE)Mn*>Q#>R%mhGy&xjEoFAlM7j8CfChk-+Xp@u7MDS dqLRr05^|I0PvhkEN-RrEcFxZ&$jnJC0st^f8G!%* delta 87 zcmZpe$lNfIdBf!C;-;477KRoUmPY3BM&^blh8FA$jEoFAlM7j8CfChk-+Xp@u7MDS dqLRr05^|I0PvhkEN-RrEcFxZ&$jnJC0susD8RGx| diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaCalculoComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaCalculoComissaoController.java index 8ef148861..f4f942578 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaCalculoComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaCalculoComissaoController.java @@ -95,12 +95,15 @@ public class BusquedaCalculoComissaoController extends MyGenericForwardComposer Empresa empresa = (Empresa) (cmbEmpresa.getSelectedItem() != null ? cmbEmpresa.getSelectedItem().getValue() : null); Date periodo = datMes.getValue(); + String subReport = "/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCalculoComissaoReceitas.jasper"; + RegistroCalculo rc = calculoComissaoService.relatorioCalculoComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), periodo); Map parametros = new HashMap(); parametros.put("puntoventa", puntoVenta.getNombpuntoventa()); parametros.put("empresa", empresa.getNombempresa()); parametros.put("periodo", periodo); + parametros.put("subReport", subReport); parametros.put("registroCalculo", rc); Relatorio relatorio = new RelatorioCalculoComissao(parametros, dataSourceRead.getConnection());