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 f2b0d82a6..5385e34d5 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 @@ -91,6 +91,8 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { private MyTextboxDecimal txtIndicePeaje; private MyTextboxDecimal txtIndicePeajClasse; + + private MyTextboxDecimal txtTaxaConveniencia; private MyComboboxEstandar cmbClasseServicio; @@ -187,6 +189,8 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { listOrgaoEmpParam.setData(lsOrgaoEmpParam); txtIndicePeaje.setValue(orgaoConcedente.getIndicePeaje() != null ? orgaoConcedente.getIndicePeaje().toString().replace(".", ",") : ""); + txtTaxaConveniencia.setValue(orgaoConcedente.getTaxaConvenienciaSVI() != null ? orgaoConcedente.getTaxaConvenienciaSVI().toString().replace(".", ",") : ""); + txtNome.focus(); chkIndmultatodasremarcacoes.setChecked(orgaoConcedente.getIndmultatodasremarcacoes() != null ? orgaoConcedente.getIndmultatodasremarcacoes() : Boolean.FALSE); @@ -243,6 +247,12 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { } else { orgaoConcedente.setIndicePeaje(txtIndicePeaje.getValueDecimal()); } + + if (txtTaxaConveniencia != null && txtTaxaConveniencia.getValueDecimal() != null) { + orgaoConcedente.setTaxaConvenienciaSVI(txtTaxaConveniencia.getValueDecimal()); + } else { + orgaoConcedente.setTaxaConvenienciaSVI(null); + } orgaoConcedente.setClassesIndicePeaje(lsClasseIndicePeajes); orgaoConcedente.setOrgaoEmpParams(lsOrgaoEmpParam); @@ -452,6 +462,14 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { public void setTxtIndicePeaje(MyTextboxDecimal txtIndicePeaje) { this.txtIndicePeaje = txtIndicePeaje; } + + public MyTextboxDecimal getTxtTaxaConveniencia() { + return txtTaxaConveniencia; + } + + public void setTxtTaxaConveniencia(MyTextboxDecimal txtTaxaConveniencia) { + this.txtTaxaConveniencia = txtTaxaConveniencia; + } public List getLsClasseServico() { return lsClasseServico; diff --git a/web/gui/catalogos/editarOrgaoConcedente.zul b/web/gui/catalogos/editarOrgaoConcedente.zul index 381a5d931..8384b76fb 100644 --- a/web/gui/catalogos/editarOrgaoConcedente.zul +++ b/web/gui/catalogos/editarOrgaoConcedente.zul @@ -110,9 +110,13 @@ use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal" precision="14" scale="9" width="50%" /> - + +