fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'AL-4781' (!652) from AL-4781 into master 

Reviewed-on: adm/VentaBoletosAdm#652
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master
aristides 2024-08-14 19:32:11 +00:00
parent 2f93119393 73a116eeeb
commit d9facd72a0
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.122.0</version> <version>1.122.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.94.0</modelWeb.version> <modelWeb.version>1.90.1</modelWeb.version>
<flyway.version>1.81.0</flyway.version> <flyway.version>1.77.2</flyway.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>
@ -76,7 +76,7 @@
<dependency> <dependency>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>Flyway</artifactId> <artifactId>Flyway</artifactId>
<version>${flyway.version}</version> <version>${flyway.version}</version>
</dependency> </dependency>
<dependency> <dependency>

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuCargaContrato.java
View File

@ -13,7 +13,7 @@ public class ItemMenuCargaContrato extends DefaultItemMenuSistema{
@Override @Override
public String getClaveMenu() { public String getClaveMenu() {
return null; return "COM.RJCONSULTORES.ADMINISTRACION.GUI.EXPRESSOS.TAXADECONTRATO";
} }
@Override @Override

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuCumplimientoServicio.java
View File

@ -12,7 +12,7 @@ public class ItemMenuCumplimientoServicio extends DefaultItemMenuSistema{
@Override @Override
public String getClaveMenu() { public String getClaveMenu() {
return null; return "COM.RJCONSULTORES.ADMINISTRACION.GUI.EXPRESSOS.CONFORMIDADEDESERVICO";
} }
@Override @Override

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuDocumentos.java
View File

@ -13,7 +13,7 @@ public class ItemMenuDocumentos extends DefaultItemMenuSistema{
@Override @Override
public String getClaveMenu() { public String getClaveMenu() {
return null; return "COM.RJCONSULTORES.ADMINISTRACION.GUI.EXPRESSOS.DOCUMENTOS";
} }
@Override @Override

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuPorCotizar.java
View File

@ -13,7 +13,7 @@ public class ItemMenuPorCotizar extends DefaultItemMenuSistema {
@Override @Override
public String getClaveMenu() { public String getClaveMenu() {
return null; return "COM.RJCONSULTORES.ADMINISTRACION.GUI.EXPRESSOS.EXPRESSOASERCOTADO" ;
} }
@Override @Override

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/expressos/ItemMenuProgramacionVehiculo.java
View File

@ -12,7 +12,7 @@ public class ItemMenuProgramacionVehiculo extends DefaultItemMenuSistema{
@Override @Override
public String getClaveMenu() { public String getClaveMenu() {
return null; return "COM.RJCONSULTORES.ADMINISTRACION.GUI.EXPRESSOS.PROGRAMACAODEVEICULOS";
} }
@Override @Override

1
web/WEB-INF/i3-label_pt_BR.label
View File

@ -5141,6 +5141,7 @@ editarFormaPagoController.lblTrocaPassagem.label = Troca Passagem
editarFormaPagoController.lblVoucherRodoviaria.label = Voucher Rodoviária editarFormaPagoController.lblVoucherRodoviaria.label = Voucher Rodoviária
editarFormaPagoController.percentualDescontoFormaPagamento.label = Percentual desconto editarFormaPagoController.percentualDescontoFormaPagamento.label = Percentual desconto
editarFormaPagoController.valorDescontoFormaPagamento.label = Valor desconto editarFormaPagoController.valorDescontoFormaPagamento.label = Valor desconto
editarFormaPagoController.lblNequi.label=Nequi
# Pantalla Editar Forma de Pagamento # Pantalla Editar Forma de Pagamento
editarFormaPagoController.window.title = Forma de Pagamento editarFormaPagoController.window.title = Forma de Pagamento
editarFormapagoEmpresaController.MSG.borrarOK = Forma de Pagamento eliminada com sucesso! editarFormapagoEmpresaController.MSG.borrarOK = Forma de Pagamento eliminada com sucesso!