From c611c3dc40a77011f073a681b9a38731af7944ef Mon Sep 17 00:00:00 2001 From: luis Date: Mon, 16 Oct 2017 15:50:39 +0000 Subject: [PATCH] =?UTF-8?q?Issue=20#9962:=20Multa=20devolu=C3=A7=C3=A3o=20?= =?UTF-8?q?venda=20em=20aberto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@74890 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../catalogos/EditarOrgaoConcedenteController.java | 12 ++++++++++++ .../web/utilerias/render/RenderOrgaoCancelacion.java | 4 ++++ web/WEB-INF/i3-label_es_MX.label | 1 + web/WEB-INF/i3-label_pt_BR.label | 1 + web/gui/catalogos/editarOrgaoConcedente.zul | 12 +++++++++++- 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java index 77db487a4..ae205a042 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java @@ -93,6 +93,9 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { private Radio radCobrancaTransferenciaSim; private Radio radCobrancaTransferenciaNao; + + private Radio radMultaDevolucaoAbertoSim; + private Radio radMultaDevolucaoAbertoNao; private Checkbox chkindUtilizaICMS; @@ -190,6 +193,7 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { oc.setIndCobrancaTransferencia(radCobrancaTransferenciaSim.isChecked()); oc.setIndSolicitaDatosTarjeta(chkIndsolicitadatostarjeta.isChecked()); oc.setIndOrgaoconcedentetransf(chkIndOrgaoconcedentetransf.isChecked()); + oc.setIndMultaDevolucaoAberto(radMultaDevolucaoAbertoSim.isChecked()); if (StringUtils.isNotBlank(txtTiempoLimiteCambio.getValue())) { oc.setTiempolimiteCambio(new Integer(txtTiempoLimiteCambio.getValue())); @@ -404,5 +408,13 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { this.chkindUtilizaICMS = chkindUtilizaICMS; } + public Radio getRadMultaDevolucaoAbertoNao() { + return radMultaDevolucaoAbertoNao; + } + + public void setRadMultaDevolucaoAbertoNao(Radio radMultaDevolucaoAbertoNao) { + this.radMultaDevolucaoAbertoNao = radMultaDevolucaoAbertoNao; + } + } \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java index e8de56250..48147b6ec 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java @@ -63,6 +63,10 @@ public class RenderOrgaoCancelacion implements ListitemRenderer { lc = new Listcell(orgaoCancelacion.getIndOrgaoconcedentetransf() != null && orgaoCancelacion.getIndOrgaoconcedentetransf() ? Labels.getLabel("MSG.SI") : Labels.getLabel("MSG.NO")); lc.setParent(lstm); lc.setStyle("text-align:center"); + + lc = new Listcell(orgaoCancelacion.getIndMultaDevolucaoAberto() != null && orgaoCancelacion.getIndMultaDevolucaoAberto() ? Labels.getLabel("MSG.SI") : Labels.getLabel("MSG.NO")); + lc.setParent(lstm); + lc.setStyle("text-align:center"); lstm.setAttribute("data", orgaoCancelacion); } diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index cd6238b50..797505517 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -5354,6 +5354,7 @@ editarOrgaoConcedenteController.tiempoLimite.label=Tiempo Limite Embarcado editarOrgaoConcedenteController.tiempoLimiteCambio.label=Tiempo Limite Cambio editarOrgaoConcedenteController.indnaopermitetransferencia.label=No Permite Cambio editarOrgaoConcedenteController.MSG.indicePeajeZeroInvalido = El Índice de Peaje no puede ser igual a cero +editarOrgaoConcedenteController.indMultaDevolucaoAberto.label=Multa devolución abierto # Busqueda Indice Tarifa diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index e1bf6cb6d..f255c00eb 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -5624,6 +5624,7 @@ editarOrgaoConcedenteController.indDevolucaoTransferencia.label=Remarcação mes editarOrgaoConcedenteController.indCobrancaTransferencia.label=Remarcação mesmo serviço - Cobrar Diferença editarOrgaoConcedenteController.indsolicitadatostarjeta.label=Solicita Dados Cartão editarOrgaoConcedenteController.indOrgaoconcedentetransf.label=Valida Orgão Conc. Remarcação +editarOrgaoConcedenteController.indMultaDevolucaoAberto.label=Multa devolução aberto # Busqueda Coeficiente Tarifa diff --git a/web/gui/catalogos/editarOrgaoConcedente.zul b/web/gui/catalogos/editarOrgaoConcedente.zul index f4b845a52..f4795772c 100644 --- a/web/gui/catalogos/editarOrgaoConcedente.zul +++ b/web/gui/catalogos/editarOrgaoConcedente.zul @@ -7,7 +7,7 @@ @@ -212,6 +212,14 @@ + +