From e9993824f55c1d28b8b640c9e8a7132f1a85e08f Mon Sep 17 00:00:00 2001 From: Lucas Date: Tue, 30 Jul 2024 20:16:50 -0300 Subject: [PATCH] fixes bug#AL-4697 novo campo sicfe --- pom.xml | 2 +- .../gui/controladores/catalogos/EditarEmpresaController.java | 3 +++ web/WEB-INF/i3-label_en.label | 1 + web/WEB-INF/i3-label_es_MX.label | 1 + web/WEB-INF/i3-label_fr_FR.label | 1 + web/WEB-INF/i3-label_pt_BR.label | 1 + web/gui/catalogos/editarEmpresa.zul | 4 ++++ 7 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 673212cf9..6f662f12f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.116.1 + 1.116.2 war diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java index e106e63b2..a4e5cd8b9 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java @@ -570,6 +570,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer { private MyCheckboxSiNo chkSicfeUsaRUTCliente; private MyCheckboxSiNo chkSicfeUsaTermica; private MyCheckboxSiNo chkSicfeDesconto100Emite; + private MyCheckboxSiNo chkSicfeCreditoOrdemServico; private Checkbox chkIndProducaoCrediBanco; private Textbox txtUsuarioCrediBanco; @@ -1716,6 +1717,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer { chkSicfeUsaRUTCliente.setChecked(BooleanUtils.toBoolean(mapConfigSicfe.get("indRUTCliente"))); chkSicfeUsaTermica.setChecked(BooleanUtils.toBoolean(mapConfigSicfe.get("indUsaTermica"))); chkSicfeDesconto100Emite.setChecked(BooleanUtils.toBoolean(mapConfigSicfe.get("indDesconto100Emite"))); + chkSicfeCreditoOrdemServico.setChecked(BooleanUtils.toBoolean(mapConfigSicfe.get("indCreditoOrdemServico"))); } } @@ -1743,6 +1745,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer { salvaValoresSicfe("indRUTCliente", String.valueOf(chkSicfeUsaRUTCliente.isChecked()), mapConfigSicfe); salvaValoresSicfe("indUsaTermica", String.valueOf(chkSicfeUsaTermica.isChecked()), mapConfigSicfe); salvaValoresSicfe("indDesconto100Emite", String.valueOf(chkSicfeDesconto100Emite.isChecked()), mapConfigSicfe); + salvaValoresSicfe("indCreditoOrdemServico", String.valueOf(chkSicfeCreditoOrdemServico.isChecked()), mapConfigSicfe); } private Map retornaValoresSicfe() { diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index a4da78af8..a39b3217c 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/web/WEB-INF/i3-label_en.label @@ -4751,6 +4751,7 @@ editarEmpresaController.semanal.label = Weekly editarEmpresaController.senhaIntegracaoAGR = Password editarEmpresaController.sexta.label = Friday editarEmpresaController.sicfe.indDesconto100Emite = 100% discount issues Sicfe +editarEmpresaController.sicfe.indCreditoOrdemServico = Issues Credit only for Service Orders editarEmpresaController.sicfe.indIsSicfeHabilitado = Sifce by Enabled Company editarEmpresaController.sicfe.indUsaRUTCliente = Uses RUT in customer registration editarEmpresaController.sicfe.indeUsaTermica = Uses thermal printer layout diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index bdaa20d74..43b5f318c 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -4750,6 +4750,7 @@ editarEmpresaController.semanal.label = Semanal editarEmpresaController.senhaIntegracaoAGR = contraseña editarEmpresaController.sexta.label = Sexta-Feira editarEmpresaController.sicfe.indDesconto100Emite = Emisiones 100% descuento Sicfe +editarEmpresaController.sicfe.indCreditoOrdemServico = Emitir crédito solo para órdenes de servicio editarEmpresaController.sicfe.indIsSicfeHabilitado = Sifce por empresa permitido editarEmpresaController.sicfe.indUsaRUTCliente = Utilice RUT en el registro de clientes editarEmpresaController.sicfe.indeUsaTermica = Utiliza diseño de impresora térmica diff --git a/web/WEB-INF/i3-label_fr_FR.label b/web/WEB-INF/i3-label_fr_FR.label index 74bb133c2..1260c438b 100644 --- a/web/WEB-INF/i3-label_fr_FR.label +++ b/web/WEB-INF/i3-label_fr_FR.label @@ -4747,6 +4747,7 @@ editarEmpresaController.semanal.label = Hebdomadaire editarEmpresaController.senhaIntegracaoAGR = Mot de passe editarEmpresaController.sexta.label = vendredi editarEmpresaController.sicfe.indDesconto100Emite = 100% de réduction sur les numéros Sicfe +editarEmpresaController.sicfe.indCreditoOrdemServico = Émettre un crédit uniquement pour les commandes de service editarEmpresaController.sicfe.indIsSicfeHabilitado = Sifce par entreprise qualifiée editarEmpresaController.sicfe.indUsaRUTCliente = Utiliser RUT lors de l'enregistrement des clients editarEmpresaController.sicfe.indeUsaTermica = Utilise la disposition de l'imprimante thermique diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 039759ccf..17acaa93a 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -4752,6 +4752,7 @@ editarEmpresaController.semanal.label = Semanal editarEmpresaController.senhaIntegracaoAGR = Senha editarEmpresaController.sexta.label = Sexta-Feira editarEmpresaController.sicfe.indDesconto100Emite = Desconto 100% emite Sicfe +editarEmpresaController.sicfe.indCreditoOrdemServico = Emite Crédito somente Ordem de Serviço editarEmpresaController.sicfe.indIsSicfeHabilitado = Sifce por Empresa Habilitado editarEmpresaController.sicfe.indUsaRUTCliente = Utiliza RUT no cadastro de cliente editarEmpresaController.sicfe.indeUsaTermica = Utiliza layout impressora térmica diff --git a/web/gui/catalogos/editarEmpresa.zul b/web/gui/catalogos/editarEmpresa.zul index 9662b0029..3b7df1e2b 100644 --- a/web/gui/catalogos/editarEmpresa.zul +++ b/web/gui/catalogos/editarEmpresa.zul @@ -2706,6 +2706,10 @@