From 0e2aa33b84577ac3bb98115e38aa2021ba8795a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aristides=20dos=20Reis=20J=C3=BAnior?= Date: Wed, 14 Aug 2024 16:15:38 -0300 Subject: [PATCH 1/4] fixes bug#AL-4781 --- pom.xml | 8 ++++---- .../menu/item/expressos/ItemMenuCargaContrato.java | 2 +- .../menu/item/expressos/ItemMenuCumplimientoServicio.java | 2 +- .../utilerias/menu/item/expressos/ItemMenuDocumentos.java | 2 +- .../utilerias/menu/item/expressos/ItemMenuPorCotizar.java | 2 +- .../menu/item/expressos/ItemMenuProgramacionVehiculo.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index d65a8b2bd..a872ba045 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.122.0 + 1.118.4 war - 1.94.0 - 1.81.0 + 1.90.1 + 1.77.2 UTF-8 @@ -76,7 +76,7 @@ br.com.rjconsultores Flyway - ${flyway.version} + ${flyway.version} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuCargaContrato.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuCargaContrato.java index a2815d321..18558805e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuCargaContrato.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuCargaContrato.java @@ -13,7 +13,7 @@ public class ItemMenuCargaContrato extends DefaultItemMenuSistema{ @Override public String getClaveMenu() { - return null; + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.EXPRESSOS.TAXADECONTRATO"; } @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuCumplimientoServicio.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuCumplimientoServicio.java index 45f8b4a1c..c20bfed5a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuCumplimientoServicio.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuCumplimientoServicio.java @@ -12,7 +12,7 @@ public class ItemMenuCumplimientoServicio extends DefaultItemMenuSistema{ @Override public String getClaveMenu() { - return null; + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.EXPRESSOS.CONFORMIDADEDESERVICO"; } @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuDocumentos.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuDocumentos.java index 17df328cc..941a339ce 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuDocumentos.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuDocumentos.java @@ -13,7 +13,7 @@ public class ItemMenuDocumentos extends DefaultItemMenuSistema{ @Override public String getClaveMenu() { - return null; + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.EXPRESSOS.DOCUMENTOS"; } @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuPorCotizar.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuPorCotizar.java index 87fbf5f99..155743297 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuPorCotizar.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuPorCotizar.java @@ -13,7 +13,7 @@ public class ItemMenuPorCotizar extends DefaultItemMenuSistema { @Override public String getClaveMenu() { - return null; + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.EXPRESSOS.EXPRESSOASERCOTADO"; } @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuProgramacionVehiculo.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuProgramacionVehiculo.java index 59de7260c..2ba9bc27d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuProgramacionVehiculo.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuProgramacionVehiculo.java @@ -12,7 +12,7 @@ public class ItemMenuProgramacionVehiculo extends DefaultItemMenuSistema{ @Override public String getClaveMenu() { - return null; + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.EXPRESSOS.PROGRAMACAODEVEICULOS"; } @Override From 6cd2b8137914ea5df1870f32ed44dd6460dca362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aristides=20dos=20Reis=20J=C3=BAnior?= Date: Wed, 14 Aug 2024 16:17:37 -0300 Subject: [PATCH 2/4] fixes bug#AL-4781 --- pom.xml | 2 +- web/WEB-INF/i3-label_pt_BR.label | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a872ba045..5482e65bf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.118.4 + 1.22.1 war diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 0bc567e7c..69be5d5aa 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -5141,6 +5141,7 @@ editarFormaPagoController.lblTrocaPassagem.label = Troca Passagem editarFormaPagoController.lblVoucherRodoviaria.label = Voucher Rodoviária editarFormaPagoController.percentualDescontoFormaPagamento.label = Percentual desconto editarFormaPagoController.valorDescontoFormaPagamento.label = Valor desconto +editarFormaPagoController.lblNequi.label=Nequi # Pantalla Editar Forma de Pagamento editarFormaPagoController.window.title = Forma de Pagamento editarFormapagoEmpresaController.MSG.borrarOK = Forma de Pagamento eliminada com sucesso! From c304765f7413e2366c263b15c8c6b8ef3be39ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aristides=20dos=20Reis=20J=C3=BAnior?= Date: Wed, 14 Aug 2024 16:21:34 -0300 Subject: [PATCH 3/4] fixes bug#AL-4781 --- .../web/utilerias/menu/item/expressos/ItemMenuPorCotizar.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuPorCotizar.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuPorCotizar.java index 155743297..d2dc22b23 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuPorCotizar.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuPorCotizar.java @@ -13,7 +13,7 @@ public class ItemMenuPorCotizar extends DefaultItemMenuSistema { @Override public String getClaveMenu() { - return "COM.RJCONSULTORES.ADMINISTRACION.GUI.EXPRESSOS.EXPRESSOASERCOTADO"; + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.EXPRESSOS.EXPRESSOASERCOTADO" ; } @Override From 73a116eeeb33f4cb0c98d46a7a4af40692d1e507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aristides=20dos=20Reis=20J=C3=BAnior?= Date: Wed, 14 Aug 2024 16:23:36 -0300 Subject: [PATCH 4/4] fixes bug#AL-4781 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5482e65bf..34e936b33 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.22.1 + 1.122.1 war