From 754c9802388dd9b3c463b7b4790e56ea35ac6e7c Mon Sep 17 00:00:00 2001 From: wilian Date: Thu, 27 Apr 2017 21:16:34 +0000 Subject: [PATCH] fixes bug #8946 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@68339 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioReciboComissao_es.properties | 32 +- .../RelatorioReciboComissao_pt_BR.properties | 32 +- .../templates/RelatorioReciboComissao.jasper | Bin 62005 -> 74036 bytes .../templates/RelatorioReciboComissao.jrxml | 301 +++++++++++++++++- .../BusquedaCalculoComissaoController.java | 3 +- ...BusquedaConferenciaComissaoController.java | 1 - .../EditarTipoEventoExtraController.java | 30 +- .../render/RenderDescontoComissao.java | 18 +- .../render/RenderTipoEventoExtra.java | 3 + web/WEB-INF/i3-label_es_MX.label | 5 +- web/WEB-INF/i3-label_pt_BR.label | 4 +- .../catalogos/editarPuntoVentaComissao.zul | 2 +- web/gui/ingreso/busquedaIngreso.zul | 3 + web/gui/ingreso/editarTipoEventoExtra.zul | 9 +- 14 files changed, 393 insertions(+), 50 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_es.properties index eb772befb..bc589ebff 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_es.properties @@ -1,20 +1,26 @@ #Labes label.recibo=RECIBO -label.comissaoBpr=Comissão BPR -label.receitaExcessobagagem=Excesso Bagagem -label.receitaSeguroopcional=Seguro Opcional -label.receitaOutros=Outros -label.bonificacaoMetas=Bonificação Metas -label.entregasPassagem=Entregas de Passagens -label.total=Total -label.totalLiquido=Total Líquido -label.descontosFixos=Descontos Fixos -label.descontosEventuais=Descontos Eventuais -label.iss=ISS -label.royaties=Royaties +label.comissaoBpr=Comissão BPR(+) +label.receitaExcessobagagem=Excesso Bagagem(+) +label.receitaSeguroopcional=Seguro Opcional(+) +label.receitaOutros=Outros(+) +label.bonificacaoMetas=Bonificação Metas(+) +label.entregasPassagem=Entregas de Passagens(+) +label.total=Total(=) +label.totalLiquido=Total Líquido(=) +label.descontosFixos=Descontos Fixos(-) +label.descontosEventuais=Descontos Eventuais(-) +label.iss=ISS(-) +label.royaties=Royaties(-) label.numpuntoventa=Número label.nome=Nome label.banco=Banco label.agencia=Agência label.conta=Conta -label.cidade=Cidade \ No newline at end of file +label.cidade=Cidade +label.baseCalculo=Base de Cálculo +label.receitaBpr=Receita BPR +label.devolucoes=Devoluções +label.receitaBaseComissao=Receita Base Comissão +label.receitaSeguros=Receita Seguros +label.receitaExcBagagens=Receita Exc. Bagagens \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_pt_BR.properties index eb772befb..bc589ebff 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_pt_BR.properties @@ -1,20 +1,26 @@ #Labes label.recibo=RECIBO -label.comissaoBpr=Comissão BPR -label.receitaExcessobagagem=Excesso Bagagem -label.receitaSeguroopcional=Seguro Opcional -label.receitaOutros=Outros -label.bonificacaoMetas=Bonificação Metas -label.entregasPassagem=Entregas de Passagens -label.total=Total -label.totalLiquido=Total Líquido -label.descontosFixos=Descontos Fixos -label.descontosEventuais=Descontos Eventuais -label.iss=ISS -label.royaties=Royaties +label.comissaoBpr=Comissão BPR(+) +label.receitaExcessobagagem=Excesso Bagagem(+) +label.receitaSeguroopcional=Seguro Opcional(+) +label.receitaOutros=Outros(+) +label.bonificacaoMetas=Bonificação Metas(+) +label.entregasPassagem=Entregas de Passagens(+) +label.total=Total(=) +label.totalLiquido=Total Líquido(=) +label.descontosFixos=Descontos Fixos(-) +label.descontosEventuais=Descontos Eventuais(-) +label.iss=ISS(-) +label.royaties=Royaties(-) label.numpuntoventa=Número label.nome=Nome label.banco=Banco label.agencia=Agência label.conta=Conta -label.cidade=Cidade \ No newline at end of file +label.cidade=Cidade +label.baseCalculo=Base de Cálculo +label.receitaBpr=Receita BPR +label.devolucoes=Devoluções +label.receitaBaseComissao=Receita Base Comissão +label.receitaSeguros=Receita Seguros +label.receitaExcBagagens=Receita Exc. Bagagens \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReciboComissao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReciboComissao.jasper index 12f45798c8d2c7b658583eda6d0e41eaa7a52c96..10dd1affdebe1d7a5a9a364511d7d9ccfec18fd2 100644 GIT binary patch delta 20691 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 delta 11937 zcmeHNdwfk-_TOvmy>AWqst+6 zu;vP54GXg}vs`ZHu&M6CyrS9`Exgf26S9gj^K#vJMFU-r)D5GNPdfx7$Kyvask z-lI;pE2~Z~O}&A7uA-vUEVpYyUTy!XgTL(ywL56(%?r%Rbr)t$au%gHi;A3+vT|zE zn|KqXJJ0RRu0=z=sOd!$T?JG9o>0>y>k%5hUWpkWh1s*totl$BmF87Uk95{X1HB!J z+`OEuTF~xjyfZhmPDjDs)BqZ0Zlw_1RI19$ahhpg-TaRI39C_4}r;3x*jr;6ErF(fiy z=j4;m8cuc=JENz%UD?q|&U_uQQ>R}FwYq#F4M$^dW*6)9r>(5fpMpnZ!`|P5E?CAb^xw%=HZdYDz z-4U=ryLnQ-QPjnVWZyH|9Bhe>Vyo}La5cY-gWV!)o>mNPDQSrbHBG!zh@mNj zTZa!eQ;jblY_1yDI~3+yoYR*=18Sx*^iW%sm3N4q)YzJPsFm_oA8Mn#%0oSsSO0Kp z<#jw9p}eHSk;=b}mXKOA$g%^sTPr^eQXOpm)Vmf6xu%gOM)hD7|H#v!j=gTiyY`G#Mf@R|vC&{DhdaJYtPTUvf zxb*MS-q&froJek}9`5KrEOA6qvd*7g$a-6Fy1n(}$*uv8qI~kZSPPH0Syy%PV|pC| zt+!9pAr)xtIo%E&`>bzIhp0dGKEJbZx6OO5zxQ`Kt)n3e=(xW3^A=6I-xb%hOV6&c zv3GUN=n>bgOZRozpBvnIpqh;)K-$o8fj~o$r@|xev<`iYq-gpXv;IgWI@_|z+}PNdeCIIX)E1iO|><~WX-gd zVX_cyIZYO-txS_O*H)IvTCgxRkx3?NsV$euT4`&F$-=djW3tv{c_=Z@WDy!HFj*UI z6`AaIZA~>I zUNl(`Z7nm|-P(G|WIeU@vh~Z?kBxqft*lRtUI$j+mFsd3RCPoP@P>xp1ZF6Bq_dE~ zw=}p0SVQ|{OdQs~Ut)s6-X=)B<1y+akD-%1fW2c?UWje5p1s?Etz#R2UV;MI(u)47 zLF*J}p))7TomCjXHc~skQ`}(hS@&NIxpNEnPT#a4NeLOFhb7Zv{tm3ca60QV1`bI` z95CEq+pGl_n}_VEP4=C;2HRwH+Beu4 z8m~WfGT2#QUjAmVugFqYwZXooJpaqzU>B{5%gx8J%fM>Lg~7h1)4|tYf+8(bovtE- zT>(~0t_)U9Lmr=(>ze4wbY?p9lCp?`80-hyH9wYTuphztu0x2&U_aBCy~M^~ztRGE zxk6WiU03r{yukoE!WGvr0I3_l6UzVr%#VB-;Gj-4$uWT1-o)q(s82Nd2^ z_Cu(=bey)!fct2^+O6HLBzlP^HT4)UjCQ+r(T2MVUAdD2;C@wc)t0Z(_jyHOp!-oJG8djHbF>-|f|F8wvA{OR5$-J8hF7nBc# z-iRt^_e8|Ukfl^USbK&1vNHB_lYrIM9OQ7TobG^Iu=^Na z$YX?DtwlWauo8lPs)Y!dPRK8Q$P7ZR`5`k2x#5S*is~2);0HaWAnpgvQIM>GJl=IH zRaig`=7pYBP(43ro`M?qK?@Yr&<|RqpvHdCVg)tvgPv1R@FwQ*zMy*dme$tMWMcS? z{gLWuI@OVf>SzYl(GyfhGpS&nBy<+l(QK-tr>Ktp#CEYcR7Ouz8I@8QJws*mEVN;B zA&$+1L2N#ZW(y#PErc0t5m?NE*VtlOs3ow^!=9tsBF1YUK+o#hqVtr-*HjM~LbgGO zI?xDe?g#xvL1BK-as{>WgUS@t+7I#_gby;Bse|UaoPHU-L_ajjh_}DY5@}``bWQ?9 z&^!=srwl<}J9V8Hr)iL!F?k7+!rq|2Ur|*3Gn&r5M@eRrEVNEs5A&QM>l>1v>Bf>I zfh6H1ok)6+#FM0uq?5Qv+$1we7LdG1vWjFq$ySmIl4B%iNvcV1Fvc5_gp#x+i6!Yv zGL&Q#NhV_>c>x(EB&8%vNa*P2Ye=?`>>)WqLLGAIP|&e0Xn-P&B$6bKga#;*NN9j! zA_?^;O017=gn25-sv@~S@&hdbT^llpB!VQGq$kM$l2np0BvVL=NuD5?PqK{UO_B{H zJ4vWNS+yA=9~9-#A!((USjQe+$4*u@FZXzp;_C$N(g80XRR<5Rg9mMfjt`bYC+a`I zXYya8f+2bXbWK{xzpFLRk{PGbV^Qnbq788OHt0n;739tE_}s0O*IVbUC-WX{uA(Hj zFXu%H+^Yi%C@|d@m`Qtz+zwE1O<|H;1e=al<8TC|DdE&Z>~ zN_>yJLZ7#q^3rsZmnksQ7qBQWQU~Txpx769i~^%{Addo*eE}y0M(e;x3e3|14?S`) zMIO?TJ`{P%*Cd9#+Of1DFV`0fCU1_?hNs z9}FK*l5Y}FPM&YBu!{2ZTwyr{d?SJd6ws>!v&q!c2DJiuqM%m5w_~7IK<_?`B-2|+ zo|SMPCHXcP`cOm{0(2!)mm%CirmhKSN$I|df=1-|wjLOz=^bYOq=2v1**Ws4+H|q8 zqvY9TLF>=o@Y=%*B+ZnrhX-e zJlA=Nh;6TD`87M|A%ec1J?rb>UTQT~_uSntpjN;Rs1;aR(*aW}Fw6Ejy-mlrml)&c zY$Mrks#^(4*jhTw-+?*wWo02NhsA6&EMr@sjBWG4Dz+U~vk!<}DhN8t>8kvPXr&^>SxuFx;UpXn>ZHTD(V2j|gXm*`HojKS;*-3#Ai z8+MiMh95D8{Yv-4HS7g|@qm~B4oran91aaI9ZVbxoID=!RxE4O-w#2*cUX z8W%tWTF?$(g!Z@`I^ZgZ!qpIs>mdfqp&M?6INSkuV+HiY{m=)G!992a;_)o>$MY}< zt6?x+g+#moNgUyR-VjoGAdKXp@Bj~kblw&o;*lO0$78|C;~g9wKAL>O!q z;jmRi!Zy(Xc8WOoK=gnQMLg^g3Gk6ff=ZDBpNMogD8|AOF%gam7gUJ?I3e8dxhR1z zga^)vQus>Dg^OYdToOy+J5dH##0vO9tbwayE&L)j!LJ^%g?=jSL=d}Cib`~d16W^F zVFPgr8;c7VC@$k|;syjzaI-f|4~k>jwRoPzN(7YE8>93&sb`{WboNtClNMb5|j@jV@Vb=PH|UKWxh1`^b8LEJdpFY?9rz7;V+U?c zZz!n_y|KNU>5Uz@ncmoeo9T@mxS8Ilz;DwVyNOM2Y|o}QwrA5D+q3D7_G;*j?b-Ck z_HIpY>?E7s*xt?b#t!_a^oG)jPyZkE#!mWA>5ZLk(;M5nncnC?4ZX2Fo8Bm|4!yC1 zx1=|A&dv134&0L7*f}=6A&=_KM{n%l&Gg0&+)QtD2Q~D@>-{Ue!C4IPDJa2Gn2pcC z9Gnjei8d_8#jp&QKp8$y^afvm)x;m(#g||su7K_MD(uA9p@R6tetZj#;u<)P@4y*c z2j_@ae1jX|3T}a)@qM_4+fm{UG;kLN;%*Gay%>)Bunq3VPWUm#;34dRhp`uahVgg| z6YwOa;3*uAXD}VV#Ifi(k1qTgv+**z@f)0m-{VZI#@YBIF2JAA!fW^bH^XB*1W)iVJj+|+c^-k)ybWIE?ePYWui@EzEzjp$sKr)3mG9xjyn;W*kMPI& zF=~01&*10zEMCoL6TRV23*@Cj@_8bV&lkbm5@CF?2_C_JAIzqY z2X65XoF?|+Oi_We#mBgSJ|tM;Fuo{0#pU7{t`f&_HGNcAFHU2*_!75@v$#WijTQ8f zVZZnWkBM*bgs8@|;-7e)J~mW~pYf`=jyJ>&j*|0+bUO!1gNMp`JWMv^ZDk{(H*{6U z%3vNRLwH{q%Hw5AK2)~iNwN(eC2!~HGLmP?JNQJ|kr&8L+%3EC5*f=qvO6!8ck#Kh z7hfX(z?aIte1*K1za|IpH8O#(l|%RzIh1de$$XC-#w+A-enh76V{#NfD<9<%WUERIU-yZh)7vTSAQ{G_0vQT`8ZwgB_cu25J|)fQsiur zE}s%(WvQ4bpAjyi2nBM1aLdJ_L@p5?`MfBVFNnEvxmY4!5=-R@Q6^s%E9C29ja((x z%D2QOxrXSCd`Ik*>%?wZE-K|laX@YnRq}mtN^Tbya@{o*>hh%>U$S>s}d0wW zT=}CcmOsfy - + - + @@ -28,6 +28,13 @@ + + + + + + + @@ -458,14 +465,14 @@ - + - + @@ -917,6 +924,292 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 103e3ea10..44a8d84af 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 @@ -33,6 +33,7 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.SaidaRelatorio; import com.rjconsultores.ventaboletos.service.CalculoComissaoService; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; import com.rjconsultores.ventaboletos.vo.comissao.RegistroCalculo; import com.rjconsultores.ventaboletos.web.utilerias.MaskUtil; @@ -68,7 +69,7 @@ public class BusquedaCalculoComissaoController extends MyGenericForwardComposer txtCompetencia.focus(); aplicarMascara(); - lsEmpresas = empresaService.obtenerTodos(); + lsEmpresas = UsuarioLogado.getUsuarioLogado().getEmpresa(); lsPuntoVenta = new ArrayList(); } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java index 5e4d4d6cd..37fa13f48 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java @@ -41,7 +41,6 @@ public class BusquedaConferenciaComissaoController extends MyGenericForwardCompo public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); aplicarMascara(); - // lsEmpresas = empresaService.obtenerTodos(); lsEmpresas = UsuarioLogado.getUsuarioLogado().getEmpresa(); txtCompetencia.focus(); } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java index 13327536b..4883b82c3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java @@ -5,6 +5,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.ingreso; import java.math.BigDecimal; +import java.util.Arrays; import java.util.Calendar; import java.util.List; @@ -66,6 +67,8 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer { private MyComboboxEstandar cmbEmpresa; private List lsEmpresas; private List lsTipoEventoExtraEmpresas; + private List lsEventoExtrasConstantes; + private MyComboboxEstandar cmbCveTipoEvento; private static Logger log = Logger.getLogger(EditarTipoEventoExtraController.class); @@ -80,6 +83,7 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer { @Override public void doAfterCompose(Component comp) throws Exception { lsEmpresas = empresaService.obtenerTodosIncluindoEmpresaTodas(); + lsEventoExtrasConstantes = Arrays.asList(com.rjconsultores.ventaboletos.constantes.TipoEventoExtra.values()); super.doAfterCompose(comp); @@ -109,6 +113,10 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer { btnApagar.setVisible(false); btnSalvar.setVisible(false); } + + if(tipoEventoExtra.getCvetipoevento() != null) { + cmbCveTipoEvento.setValue(tipoEventoExtra.getCvetipoevento().toString()); + } txtNome.focus(); } @@ -151,6 +159,10 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer { tipoEventoExtra.setIndboleto(Boolean.FALSE);// não valida boleto tipoEventoExtra.setPorciva(BigDecimal.ZERO); tipoEventoExtra.setIndtipo(raTipo11.isChecked() ? "1" : "0"); + + if(cmbCveTipoEvento.getSelectedItem() != null) { + tipoEventoExtra.setCvetipoevento(com.rjconsultores.ventaboletos.constantes.TipoEventoExtra.valueOf(cmbCveTipoEvento.getSelectedItem().getValue().toString())); + } try { tipoEventoExtra.setActivo(Boolean.TRUE); @@ -238,5 +250,21 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer { public void setLsEmpresas(List lsEmpresas) { this.lsEmpresas = lsEmpresas; } - + + public MyComboboxEstandar getCmbCveTipoEvento() { + return cmbCveTipoEvento; + } + + public void setCmbCveTipoEvento(MyComboboxEstandar cmbCveTipoEvento) { + this.cmbCveTipoEvento = cmbCveTipoEvento; + } + + public List getLsEventoExtrasConstantes() { + return lsEventoExtrasConstantes; + } + + public void setLsEventoExtrasConstantes(List lsEventoExtrasConstantes) { + this.lsEventoExtrasConstantes = lsEventoExtrasConstantes; + } + } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderDescontoComissao.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderDescontoComissao.java index ca67bfe51..216b7bf55 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderDescontoComissao.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderDescontoComissao.java @@ -1,21 +1,16 @@ package com.rjconsultores.ventaboletos.web.utilerias.render; -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.text.SimpleDateFormat; -import java.util.Locale; - import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; import com.rjconsultores.ventaboletos.entidad.DescontoComissao; +import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.LocaleUtil; public class RenderDescontoComissao implements ListitemRenderer { - private static NumberFormat NF = DecimalFormat.getInstance(new Locale("pt","br")); - private static SimpleDateFormat SDF = new SimpleDateFormat("dd/MM/yyyy"); - public void render(Listitem lstm, Object o) throws Exception { DescontoComissao descontoComissao = (DescontoComissao) o; @@ -25,14 +20,13 @@ public class RenderDescontoComissao implements ListitemRenderer { lc = new Listcell(descontoComissao.getItemDesconto().getNomitemdesconto() != null ? descontoComissao.getItemDesconto().getNomitemdesconto() : ""); lc.setParent(lstm); - NF.setMinimumFractionDigits(2); - lc = new Listcell(descontoComissao.getPreco() != null ? NF.format(descontoComissao.getPreco()) : "0,00"); + lc = new Listcell(descontoComissao.getPreco() != null ? BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(descontoComissao.getPreco(), LocaleUtil.getLocale()) : "0,00"); lc.setParent(lstm); - lc = new Listcell(descontoComissao.getDatainicial() != null ? SDF.format(descontoComissao.getDatainicial()) : ""); + lc = new Listcell(descontoComissao.getDatainicial() != null ? DateUtil.getStringDate(descontoComissao.getDatainicial(), "dd/MM/yyyy") : ""); lc.setParent(lstm); - lc = new Listcell(descontoComissao.getDatafinal() != null ? SDF.format(descontoComissao.getDatafinal()) : ""); + lc = new Listcell(descontoComissao.getDatafinal() != null ? DateUtil.getStringDate(descontoComissao.getDatafinal(), "dd/MM/yyyy") : ""); lc.setParent(lstm); lstm.setAttribute("data", descontoComissao); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTipoEventoExtra.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTipoEventoExtra.java index e3f6de0c7..79afcad19 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTipoEventoExtra.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTipoEventoExtra.java @@ -18,6 +18,9 @@ public class RenderTipoEventoExtra implements ListitemRenderer { lc = new Listcell(banco.getDescTipoEvento() == null ? "" : banco.getDescTipoEvento()); lc.setParent(lstm); + + lc = new Listcell(banco.getCvetipoevento() == null ? "" : banco.getCvetipoevento().toString()); + lc.setParent(lstm); BigDecimal valorMax = banco.getImpmax(); if (valorMax != null) { diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index bd8ccc66d..119ea685a 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -4954,7 +4954,7 @@ busquedaTipoEventoExtraController.lh8.label = Compesación busquedaTipoEventoExtraController.lh9.label = IVA busquedaTipoEventoExtraController.lh10.label = Empresa venta busquedaTipoEventoExtraController.lh11.label = Empresa ingreso - +busquedaTipoEventoExtraController.lhTipo.label = Tipo # Pantalla de Edición da tipoEventoExtra editarTipoEventoExtraController.MSG.formaPagoObligatolia = Forma de pago es obligatória @@ -4997,6 +4997,7 @@ editarTipoEventoExtraController.MSG.contaContabil = Cuenta Contabilidad es oblig editarTipoEventoExtraController.MSG.natureza = Naturaleza es obligatória editarTipoEventoExtraController.lbIndconferenciafisicacomissao.value = Exigir Conferencia Fisíca Comisión editarTipoEventoExtraController.MSG.selecionarEmpresa = Seleccione una empresa! +editarTipoEventoExtraController.lbCveTipoEvento = Tipo #Pago Motorista indexController.mniPagoConductor.label = Pago conductor @@ -6488,7 +6489,7 @@ busquedaCalculoComissaoController.registro.comissao.msg = Registrado el cálculo busquedaCalculoComissaoController.recibo.texto = Recebi da {0}, CNPJ: {1} a importância supra de {2} busquedaCalculoComissaoController.recibo.texto1 = Referente a comisión sobre la venta de pasajes en el período de {0} a {1}. busquedaCalculoComissaoController.recibo.texto2 = Pelo que firmo o presente, para todos os fins e efeitos legais. -busquedaCalculoComissaoController.recibo.msg = Enviar esta via firmada y adjunta a la factura para el sector financiero de la empresa {0}. +busquedaCalculoComissaoController.recibo.msg = Enviar esta via firmada y adjunta a la factura para el sector comercial de la empresa {0}. busquedaCalculoComissaoController.recibo.msg1 = Via para controle de la Agencia (no enviar para la Empresa {0}). busquedaCalculoComissaoController.recibo.email.assunto = Recibo Comisión Competencia: {0} diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 830d1f7a4..059122bc0 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -5035,6 +5035,7 @@ busquedaTipoEventoExtraController.lh8.label = Compensação busquedaTipoEventoExtraController.lh9.label = IVA busquedaTipoEventoExtraController.lh10.label = Empresa Venda busquedaTipoEventoExtraController.lh11.label = Empresa Ingresso +busquedaTipoEventoExtraController.lhTipo.label = Tipo # Pantalla de Edición da tipoEventoExtra @@ -5078,6 +5079,7 @@ editarTipoEventoExtraController.MSG.contaContabil = Conta Contábil é Obrigató editarTipoEventoExtraController.MSG.natureza = Natureza é Obrigatória editarTipoEventoExtraController.lbIndconferenciafisicacomissao.value = Exigir Conferência Fisíca Comissão editarTipoEventoExtraController.MSG.selecionarEmpresa = Selecione uma empresa! +editarTipoEventoExtraController.lbCveTipoEvento = Tipo #Pago Motorista indexController.mniPagoConductor.label = Pagamento Motorista @@ -6681,7 +6683,7 @@ busquedaCalculoComissaoController.registro.comissao.msg = Foi registrado com suc busquedaCalculoComissaoController.recibo.texto = Recebi da {0}, CNPJ: {1} a importância supra de {2} busquedaCalculoComissaoController.recibo.texto1 = Referente a comissão sobre venda de passagens no período de {0} a {1}. busquedaCalculoComissaoController.recibo.texto2 = Pelo que firmo o presente, para todos os fins e efeitos legais. -busquedaCalculoComissaoController.recibo.msg = Enviar esta via assinada e anexa a Nota Fiscal para setor Financeiro da Empresa {0}. +busquedaCalculoComissaoController.recibo.msg = Enviar esta via assinada e anexa a Nota Fiscal para setor Comercial da Empresa {0}. busquedaCalculoComissaoController.recibo.msg1 = Via para controle da Agência (não enviar para a Empresa {0}). busquedaCalculoComissaoController.recibo.email.assunto = Recibo Comissão Competencia: {0} busquedaCalculoComissaoController.recibo.email.texto = Recibo Comissão Competencia: {0} em anexo. diff --git a/web/gui/catalogos/editarPuntoVentaComissao.zul b/web/gui/catalogos/editarPuntoVentaComissao.zul index 842f0b1df..df7ffc4cf 100644 --- a/web/gui/catalogos/editarPuntoVentaComissao.zul +++ b/web/gui/catalogos/editarPuntoVentaComissao.zul @@ -328,7 +328,7 @@