From 8fb8989751967bf622e5a5235121c745cf885e39 Mon Sep 17 00:00:00 2001 From: frederico Date: Mon, 16 Jan 2017 19:29:23 +0000 Subject: [PATCH] fixed bug #8534 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@64990 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasComissao.java | 18 +++++++++++++++--- .../templates/RelatorioVendasComissao.jasper | Bin 36561 -> 37332 bytes .../templates/RelatorioVendasComissao.jrxml | 10 +++++++++- .../RelatorioVendasComissaoController.java | 4 ++++ web/WEB-INF/i3-label_es_MX.label | 4 ++++ web/WEB-INF/i3-label_pt_BR.label | 5 +++++ .../filtroRelatorioVendasComissao.zul | 14 ++++++++++---- 7 files changed, 47 insertions(+), 8 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java index d9953b555..68f7a7f13 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java @@ -29,6 +29,7 @@ public class RelatorioVendasComissao extends Relatorio { private Timestamp fecInicio; private Timestamp fecFinal; private Integer empresaId; + private Boolean apenasCancelados; public RelatorioVendasComissao(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); @@ -43,6 +44,8 @@ public class RelatorioVendasComissao extends Relatorio { if(parametros.get("EMPRESA_ID")!=null){ empresaId = Integer.valueOf(parametros.get("EMPRESA_ID").toString()); } + apenasCancelados = (Boolean) parametros.get("apenasCancelados"); + Connection conexao = this.relatorio.getConexao(); processarVendasComissao(conexao); @@ -187,9 +190,18 @@ public class RelatorioVendasComissao extends Relatorio { .append("FROM CAJA C ") .append("JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") .append("JOIN MARCA M ON M.MARCA_ID = C.MARCA_ID ") - .append("LEFT JOIN PUNTO_VENTA PV1 ON PV1.PUNTOVENTA_ID = C.PTOVTAVENTA_ID ") - .append("WHERE ((C.INDSTATUSBOLETO = 'V' AND C.INDREIMPRESION = 0) OR (C.INDSTATUSBOLETO = 'T' AND C.INDREIMPRESION = 0) OR (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C')) ") - .append("AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal "); + .append("LEFT JOIN PUNTO_VENTA PV1 ON PV1.PUNTOVENTA_ID = C.PTOVTAVENTA_ID "); + + if (apenasCancelados) { + sQuery.append(" WHERE (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C') "); + + } else { + sQuery.append("WHERE ((C.INDSTATUSBOLETO = 'V' AND C.INDREIMPRESION = 0)" + + " OR (C.INDSTATUSBOLETO = 'T' AND C.INDREIMPRESION = 0) " + + "OR (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C')) "); + } + + sQuery.append("AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal "); if(parametros.get("EMPRESA_ID")!= null){ sQuery.append("AND M.EMPRESA_ID =:EMPRESA_ID "); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jasper index 4d8c3cfdb023fdd74b4de6ed3412ebf065247f89..67106bc11ae8fda35ffdbf1d55009697da5f8944 100644 GIT binary patch delta 10362 zcmeHMd301o*1xwZB%S2Rl5_%Ofds;qKp+Vqfv|)SLiUgaNC<=`X+j`-I)H4AI*5V` zP>!P?1MVWOU;|N625?*lM_fQg9W;W93J5L?i{N+b)g$R=`a9!4pXbaulSAEi@9);D z_p5qUzpB@~yP19PFx#FHidI)<=wv1?_p-Vk4WEW$L4?)SrT0t}$0Dt+l@W7LOz&%T zeIIE@@lKT0wXkmmihBoIUB{z#ad9EKn`_&^Tqf=tY!%_zJzP;S%_w|gt*)mBm!N1E zYITLiQlsaFSzW7#R--pSn(_EcXgJ4Y2qO0D?^apl&)ZZkUqS=ZXWo@{-e1 zWn#T*wXO0>34SlWosx>@MO=DL$W>3Z2xGqDzVxwF>BID_5byuH(%1}HX<0^Y6g}2E zB{!=mJEvo90OP@DGDh}1PhE6?wy3bqVXK~IudT2(>0Q1mW{(cC)&&t&!YnBJJ3NZHZZ5gxPRmh5ppiff3tQXS&mMzV+C zIh(OqJeX4)HA~Xe%}jl$ArIh{Lh7NctrD|DYjI$vs;KG|bgZKiMII8=l$;qb{aT|l z#q!+c7$Yv`Uch?sZegI9-N#30Q`4dx@|n76^gu>sbu!BJK*l{`B4Z>vkZBY>@7$RDWtin-Ps#CE= zJs@f5W{ZabQCXdaay`&+Pnc*Ji4HWj=rk&)Tg6XBHe*B@rlmzaBdO@-DGyXsR;Qv| z4^-R}CMrgv1C^(ADqqd8ie=Mh8dT0rPm6j4V}u#nO3o?WV%7+`;xS% zqmqhlj(DJ=vN{#zdZ6N-Fi|lQ9jF}9seCZ2o47c$h^Rc66C$cg2Wltkr49fQg8d?* zPj|6=fJMAi>aVj^%l-4xl&G&IW8Hk^fw9W!jFszwv3tVA*hq9>{FPkp;zF)foSc<} z-eP}Vm{?)+6&bVr@y9kTs-JyV)MZIdH|IT&Q&~xFlyW_gb5EGa88_FK^&t6{e0G+V zxIKN)oHVB|J)P^ur{mLA!dE3S+$7hOa2IJ)!kx>t#IFX5ujD>Dv);BwH)c=SQk>l- zGu;GvV5YJjn7JoR%-j$xXk7>DZ)`o0 zg05s(+l=qB=Di`4TU(NQoV&4iMZW}VOuDU|R_3fV>&@B5ghdRad^Tk}|;ZUkF=zv}k<0JYc z>qpjza&=~{vDZ54n)*bHj_A`z>>n76Q(e91F$`%PKS3WUZLx)}U8TQ7Kijs7F_i zc)>^wI)S$@Fc_tQkMc%qU{PL@2ENK0r-7gHCTQTVyonlU%A2IYb;_HpL1*Pn(V&a+ zGBjeZKO;+nZpw4!Xb_;>JPiVsm#=|Ud4(DTDQ}tv!OEMVL3ibqXwXA>r5f~9-fRs* zls89%Q02|lAWV4`8iXrvo(8?3x380WJYRzda>-kuL8S7kHRz+fS`GRtuU>;FWFbyj2MZam-Jg+Mke8ZYrdqbZR)hfKDbv#P3yYGo(o0hF zEwBxttAQ7$XQ!5xEbugf)u=W(Ju8)(Ey&H97AjkKmRk7r zx1I%di2Lhf$SulGA#N`tgoq7QA=K($L{>x3u>A<$M5<8U^a_ISJbQV1ZB@A(h*!mp z4I$~TxA!qSc}7`EZcz?B_|0~-Ff}_bE4eV0I{G&RAA3!GqrJ&yfw$>>QEQW{YHigP zcn3w^_#X7wcf~IaJ@I|yEY3`0H(5Yvwos@|(9Trzm@(?C2K= zLum>O5V1{u&abFd^=aCc{~AHNHms_@-_o4an=tx+nrav~8OV2pxPP@;;2c6Xg_t_^ z146J{MX`3Yzr_MSA%rd}6#GZ_^s>OeP>jo#Z~me{M{m3=A{}YbNT2iF^od<^wamo=F*#*1On!|2Xp?%TNim>}&pdVUcq!`y6%7Rhsm>b9~^ixGca}b7zHO(X9 z!Z6$qL$Mb^(7>#AVg-)Is@lpiico|fcE?Df9$~@0;&k)qe*Lh�L1mBj`)Bw4GMH zoz`DPU9ttEMb@Gy=U^NnYsQ+oJ+ZE?+HR}$!C^Gsb5$_SR^4nz-~$JhXc&(Pei( zAWjg+7WL>cktkNv@K(pV&pVtXIxh}olToaQ2=}t!6#AJcvJVYnhGFPbtkj!U@uqDx!Qi+_zSt4gi zF#Qr>U-Gikn|4$tw+Q`8`-6U^-9f+7-k@J;XV9;-FX&g=74$3Z3Hp_G1pP|;fqtdk zK)=#npkHYx(62*`D{TULJk)78v;*h>>A!v@^{16Lp*rlnIrb?QH($q*(CryJiP0}<=vsjuNq**4-3Td3u+$hb>(yS)a3)V>YHfh#L zbH@(qA;O(xcf$~|ed)8#6!@6V4hVO_dNmR>B8<*5bV!PhX@R?=2e-hVqKCA=|Fqv5 zpyzYxu#-mznW=O%$)|g08&xf^LBJ^n+z}lU@aGrcAqM;45&9#_(qn$AU@0p;=_SZa*j)MRtG(Be0nXME?!Yr5qvk57KYC5E^1RG77x$qE_!%nDx z*T4=(VIF(~mGCpn$IeiN5wHN`VIfX}YMcf&I3H?pDb(TZP>)-n0iD~Sk>(1WwT#*K zrkXpjfyjPfFgvmjj>vTp6L8doEF|P36H-ISCnlthkYgsKfsoIxAx^#NCW1b{2I)vM zAty}8;`V{*PX~E`r8F?hXkeDpz^tHwSxE!qq=8vQ-iVRUksI(sk}+$FqKv+^rJjn zB$eqzr5lxSDpU^>siaY%&rvL=(m-W7l{Hl8UOX=MBq}*nibcw*K<9e$Hc@$u%1$Z= zs2rkljLIo0mxzglN-&iuD)Ce%P@xuhDU}6On)e_t_G&@z?5(WD&41F(zhC-X)e-Hu zldW+}ENf4&IybyLdM7O2jeh%3qem1`RMQrvQB>C!B~sMT7R69h)fR)0 zcRMkFTJ+k3*5Vcn%HE0>_h9#8O7+~00ncOa7VHywj(5%+;_AUdz#3f_U3NZD1!lgD&?@(sH&X&>_4 zIKJ)4$-jDXdlmKMcf9v?dSGLH;#bm#Nf z@H$qB-B=w4utp4KOR+m!fuU?QhOt{Qg006$Ca@pdg#FnTjAqWqFotczp=>7(V=XwG z9l#OnRZL`ua5Q@#$FXBLp0#2MJB5?jcQ}Pz!gO{8v*}2k!~HRz2V(*6iPL!$&fo*E zl*i*NJ_2og0?y?rIFILGC7+55c_~)&GOXtduz}ZLGjGO4dO^fN#HbH5r2O{ z?4&EA7_%z$KS~LUO-g7)h7uZ)p@c?cD4`J>Jc>^I z1lQm{aV@suVf>tsFY!2jMfO|zay>;#c$Sp#94X;Xq=e^52``ZnUM3~{h1D@&jm(QJ zWu4dx=F3(yKXxnY%+|9mOt3(*vINQm3u@=^c9bkRgt84%}#0IkW z*^nA+U1Ha>D{Kt6uq5u!Ch%aE%zLs_9>pf}0W5>ZvrImMYMQ5$2F^TQKH1-^3u-&ADbP$`t_Fy@C3FonW*ueIqgAQfO*=y)zZ{ZsDH(bl! z!NYV&JIX%5D?vXk6qz|xP?b^e;&(&`B2`IC-5jfoDblmcsx(!BluW8fsf-Ud?L>w zJC&#LQa**3@hrZ8XY(3Dnt487!lw=5tN3hE!ZJF7le{}1s4Q-H$N!XcK)i_a2@`wn G4E|qikOL|J delta 9737 zcmeHMd3Y36wm;`qNIFSDNYZRsNPq~jvl0jpRzpZalg{2`Ba(DT8xpgTbV7(i^F)zR zQSiDWGN|M3fHV?O&^QimI4C2I8@PbV$haYcGUDhvw{DSiP2%_b=gs%NZys<@o%1`l z?)lZNy1%;B9J!Aj-pY0^3dc}SPIwkWv*+f>dgPlU&7PpBCCJZ@HG9@XS0itTHhaDu z=S2R&IJ4*S3AM;eCzw4aVxCm^>oI1}W3e{I?}!cd_{VKRe$Ha%b8~_``{Hwu-x+WA zgeR6D_e(VMH*zC+R(Xo&NKz#76-j3Plx-~EmNLatGC2bI>0~ocwvF*@OUXyxmSXm> zsa43onqu~Jq~76+qd5A&G5*0Vc12HTb>@l*x&jdsJXu?QIaxC;LtE zWG=Azj5r0b@+$xY(f6CyR&hAPA6Qs0{s$NM6r^Wo3S?7jyEyc9UL&Hf`DkksbP`m^w6UG7%JVmGfL=H}XWE!Et*xyt zP&@4{E=OaDv$@vMuCYJQTWyiUbgCe(i^cL=b5d#igENfEVmUNEDELDrBPgmlBHyNznP?wnFKJk;?eP`B!pWYUXJLpJEf= zG%1Xy6=nyn5M?yeqEV6YAXK~)1}feO0~I|nfJzI0Vq5}-c#?~3h}ZL<@&JNrvh-hYuMnuMg5b;hJ zhk6*mx%lY`hZ&HhN+Jn;vaqZYeeM*z#(f z%6;Y8fiDRvnmM3Rk?|l@yb}g0-U$O0Ju!gF0gZ~e+{_=ZDAlP%Ey)giOHk3wn;I1v z4?@K|VW8rjFi_DG1E{>IQMt3i%rCAiA}WXS!uV~KvG_56t}>P4O_Rd;@Jr_hekQ1C z<`a#Yj0d6SoiI@IP8g`^i2>9;5sRCTs0`*IOXuMb{#8K)Z(eG~)0*OJU3ydCIYCM@ zX9TGR84p6rJ7FN@oiLEn6ZG!zX>MtD$}#&S@Qg<7FzzYK3)I6qfEFh4sXM!f{&RM{Bp~g`LiM zF|$Nr&7=)dSZ1}tx=V%2q&rAqJu#qg8X?9%E-+;_wYE9i9W%RH#mxnPIi4@;7~%)~ zo8_a)`q#&*lcHYz>FH-FmxzUYPJLv^)TxuFq@|=zNlTtqHD&trB4SRTu)k{=i_m3VzZ{Q^6#?St|HTZ;lE9(wnD3p!CvJP^Fil!cggDsxVA? z*(wA{&#J<3>E);pEIoIw3L(r{xAV7&_Cq<6Ur=BQ!Xzw@UCfgrP;5 z1^GqxDqDU=x-HWLcM#Oz=yW7?xau2|aviOHa2JA7=XCMASB~eet?&=L8@2|*7Pto? znXecU!4o?I-35*|N0Za#Z1aQPA_O(JEO59SMb1WttEH{J#RT`#u#3`*3o?tUWI+?$ zj}W34FR>Qc7pL2-6`4gQcmQFzj@zxdnN=0}dBp1>gur4!G|QT4TTpC*M-a?evta<5j z++UVoG}X4eeppKlF3WO)sm;$X}dCrT^HE+B0(tZ0Yt) zy5tuT{G4*Fo8V=-p)^`neY2y{1g|15m^a$j1g{YlzPZt?nBWj^sh`MSYxMW=gEx@B zo*N!!fZbwBas{^Z^0l)2k|PaqfI^)gSSoj;ZeBG@Sf2>PvirpkA0>dDWlM zqpO{(&%$4+hklZdoFc^gtH}gk(EXH%;ex(G80poKKW-1C8Tp34(GiW`^3xq*_;;>$ zM&WlnzBAhb=V=t}sc&>N*Ckn-UCui3DE|||C)Rp#i3%z3a{&B=z_)hBOk=17z+v>E zsn$+va=4Z!&9ARp;9OSU zmC;&p`r)tu41!c{T^XJjOmzCsZ*|fVs%Z6kfzjyJ99z!dQV{Ok;bM zbkxyvWx}`sI3cbxo^M-u5sz5q9~O;?qI(kEi2m-ibbXWgyj7z|Pa)=wbmfhS-cJRl z@|IQMY&!DQ(UCqTOrxI!#*Ozi;VgtGK0In9kM0Zz#5uI0oSlxw4w~Ei##)L+p^m-;cm45r!LIjb}w=F#| z&4N$D3}I#pGh3Ls!dxQEd|?&{lO@bTVHOEv6DCiX0%3}Tu?yoa5w=X23SlaRSt?Am zFg3!|3Uiq-%Y|tWrcsz?VOoW06UHS>r!ZZ@bPIE(Fl&TaE6i2GTrJFcVK!KT$zJya zT^z#oWOvb1ICk|8cL>Edz(zR%GzpA0DgeVRaXqlv65j*2SQ2{R_Wtuiw0s`zWb$d3 zQb7BTLOO@umU09Z3JS%5+bnS*ckYF440>TZ{S$K;7jmBgnQ4i0hy2a}&8AKd8j!h! zJZwNNA>>g5GM|vg4afpQb{LQ>LY^=n3kh+14A3Hio-`mfLV65H9wB=TNC6?w7?2`D z_8Sm8A>a6q*lA9ZtY>H zp*hvgi9$}3XM=jzYJBwCUC&LPy@SR8N3L!@D4cP6kG;BLLCl+ z(B4UZ%wCZX2|Z!%xRBR%T8De#uz338 zLf$kW%L#eQfHV;DwgG7*OOvw8Nq?M3k2Bb|qe;*nkSO1efk@n*NT{J1HXi~aq zQm&v$xsoPjHBHJI`s=1iSxXm2`#*VM7^q*^OH}J)ec%(la6+usxR6f`NEaa|FWi6G zshgnB4V|te9~oeV-r0io9P+3nVu0&lX4FJK@;=?o#{i- zk3waA-XdQCP#l;W?tFxtN=l1A7HWH`9iVoY+A(UMQ#(s~Lb8lQsg0pV!i}laGN=_& ztD@FKt&7?^YIH7sNH3cNYBQ*1@Wa=JyE%E=sqLV)pV~oc?@~KSjVdUDQZThBYILSD zi<*_1{TcYF+@}XI_d#}-mw%&|f0ghR*{9PBZ|KL}Y^hhGs6WB7EW5$A2Z!{cAC;Iv zQA1y3p{TJhilC^uFB(SCWqlD)wERMZ-&#V^e-94LeGpGRgF)pz=pIh~(PuEEoKj{= zJ%wRC7#WIDdvF4sTeb&ddT}HLIuwc%saJoz8*2Kx>_H2Sb|aluEisDL>SMohID~a%V_4nB1At^(A+<=E8Y$=Sue* zaxanYr2 za0tslUzUXdEDr-&AqKH>9L_4y%xZB2tHUv@1;bbyj%D2##a814b`8d`4H(NfUd(R8 z1hyR$+5MQpcHk7Y3#YUFID_@#Y<3XmutS*6-lhA`j$#%&iP`KF=CHG9W9P6yQLs?) z#l=c6mMCVdP@-^&G9Igx1gut)u~wOdPGv6ED^_e!Y}l;Wu|+AxcBP804>9|H(6@eh zTk@Z-Z;K52rboKI>5;B)dZg={9_jifqyKyQmh&t0E$82q+16Ci)#=6DiXzq)4~IM|dZEj(3p?-2-QF8=S-Y5b=Kc0)GgH;=?!`AICBHd-|~7 zg_F>O7VN=PdPhN)%h5jAsj#1ZGu|S*|jR zjc2=g8vPz|j)snv1{$JnpecgZf{w@Dk=v)53Q{Uuv`GUUb(f{WD zE#IJTdZg={9_jj~N4mc0k*;rg^lS8uH38`Y>|^b4fVoKDSQi{-tKbM*4ae9T_=sHv zpR;xF1-ll`vJG&K-9VeEjp)NR<4|@pZJ=(WjnnNI!M5Neb~jqsZ!wiNN;BB+FoQin zd!a|LkUffa+B8+Momj(mV-tH4TiIUhVo&20>{(pLp2PL*1w72$f5ao~W&Du6g2&mP zSOTd|GW#=|!QN!E*xM|Fy~DCdfb!TeR>(ePWx6t#tW}w<*py2Y uyOOSyDw#@^l1utV|A9-JWOTuZs>xFa{wJObQktEv#P-V)8~7ueE&mNv1yq^< diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml index 829616695..de52a226d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml @@ -7,6 +7,7 @@ + @@ -40,7 +41,7 @@ - <band height="61" splitType="Stretch"> + <band height="81" splitType="Stretch"> <textField> <reportElement uuid="43b2c28d-4760-4890-b00d-25e931e79c74" x="0" y="0" width="620" height="20"/> <textElement markup="none"> @@ -72,6 +73,13 @@ <textElement/> <text><![CDATA[Empresa:]]></text> </staticText> + <textField> + <reportElement uuid="f1811f21-420c-4faf-87d2-2d46e1b74118" x="0" y="61" width="139" height="20"/> + <textElement> + <font isBold="true" pdfFontName="Helvetica-Bold"/> + </textElement> + <textFieldExpression><![CDATA[$P{apenasCancelados} ? "Apenas cancelamentos" : ""]]></textFieldExpression> + </textField> </band> diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java index 7b4af4bdd..791ecd9e8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Controller; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Checkbox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; @@ -43,6 +44,7 @@ public class RelatorioVendasComissaoController extends MyGenericForwardComposer private Datebox dataInicial; private Datebox dataFinal; + private Checkbox chkApenasCancelados; @Override public void doAfterCompose(Component comp) throws Exception { @@ -74,6 +76,8 @@ public class RelatorioVendasComissaoController extends MyGenericForwardComposer parametros.put("empresa", "Todas;"); } + parametros.put("apenasCancelados", chkApenasCancelados.isChecked()); + Relatorio relatorio = new RelatorioVendasComissao(parametros, dataSourceRead.getConnection()); Map args = new HashMap(); diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 2e69c527c..d20b876d6 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -6421,6 +6421,7 @@ editarPracaPedagioController.btnFechar.MSG.borrarOK = Caseta de Peaje Excluido e relatorioVendasComissaoController.lbDataIni.value = Fecha Inicio relatorioVendasComissaoController.lbDataFin.value = Fecha Final relatorioVendasComissaoController.lbEmpresa.value = Empresa +relatorioVendasComissaoController.lbExibirApenasCancelamentos = Exibir apenas cancelamentos # Relatorio de Depósitos Detalhados relatorioDepositosDetalhadosController.lbDataIni.value = Fecha Inicio @@ -6658,6 +6659,9 @@ relatorioDepositosController.lbPendentes.value=Filtrar Pendientes relatorioMovimentosAtrasoController.window.title = Reporte Movimientos Retrasados relatorioMovimentosAtrasoController.btnCerrar.tooltiptext = Cerrar relatorioMovimentosAtrasoController.btnPesquisa.label = Búsqueda +relatorioMovimentosAtrasoController.radioTipo.label = Tipo +relatorioMovimentosAtrasoController.radioTipo.tipoMovimentosEmAtraso=Movimentos em Atraso +relatorioMovimentosAtrasoController.radioTipo.tipoConferenciaEmAtraso=Conferência em Atraso relatorioMovimentosAtrasoController.lbCompetencia.label = Competencia relatorioMovimentosAtrasoController.lbCompetenciaLayout.label = (MM/YYYY) relatorioMovimentosAtrasoController.lbEmpresa.value = Empresa diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 75a1df9c6..e1d6c30e4 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -6608,6 +6608,7 @@ editarPracaPedagioController.btnFechar.MSG.borrarOK = Praça de Pedágio Excluid relatorioVendasComissaoController.lbDataIni.value = Data Início relatorioVendasComissaoController.lbDataFin.value = Data Final relatorioVendasComissaoController.lbEmpresa.value = Empresa +relatorioVendasComissaoController.lbExibirApenasCancelamentos = Exibir apenas cancelamentos # Relatorio de Depósitos Detalhados relatorioDepositosDetalhadosController.lbDataIni.value = Data Início @@ -6842,9 +6843,13 @@ relatorioDepositosController.lbEmpresa.value=Empresa relatorioDepositosController.lbPendentes.value=Filtrar Pendentes # Relatorio Movimentos em Atraso + relatorioMovimentosAtrasoController.window.title = Relatório Movimentos em Atraso relatorioMovimentosAtrasoController.btnCerrar.tooltiptext = Fechar relatorioMovimentosAtrasoController.lbCompetencia.label = Competencia +relatorioMovimentosAtrasoController.radioTipo.label = Tipo +relatorioMovimentosAtrasoController.radioTipo.tipoMovimentosEmAtraso=Movimentos em Atraso +relatorioMovimentosAtrasoController.radioTipo.tipoConferenciaEmAtraso=Conferência em Atraso relatorioMovimentosAtrasoController.lbCompetenciaLayout.label = (MM/YYYY) relatorioMovimentosAtrasoController.lbEmpresa.value = Empresa relatorioMovimentosAtrasoController.lbPuntoVenta.value = Ponto de venda diff --git a/web/gui/relatorios/filtroRelatorioVendasComissao.zul b/web/gui/relatorios/filtroRelatorioVendasComissao.zul index 3c3ccdc9e..6c1282c7a 100644 --- a/web/gui/relatorios/filtroRelatorioVendasComissao.zul +++ b/web/gui/relatorios/filtroRelatorioVendasComissao.zul @@ -10,10 +10,10 @@ contentStyle="overflow:auto" width="700px" border="normal"> - - - - + + + + @@ -37,6 +37,12 @@ model="@{winFiltroRelatorioVendasComissao$composer.lsEmpresa}" width="95%" /> + + +