From 1bfcaea9dd4d6e311fb22d592cd65f30951d1edb Mon Sep 17 00:00:00 2001
From: "aurora.cuaquentzi" <aurora.cuaquentzi@RJMX76YYY93.mex01.local>
Date: Fri, 19 Jul 2024 13:23:18 -0600
Subject: [PATCH 1/2] bug#AL-4505 Bolivariano - Sangria. dev:Lukas qua:

---
 .../catalogos/EditarPuntoVentaController.java             | 4 ++--
 .../web/utilerias/render/ParamRecoleccionRender.java      | 4 ----
 web/gui/catalogos/editarPuntoVenta.zul                    | 8 --------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
index b0ea9e2ec..aa1b7507c 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
@@ -2822,11 +2822,11 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 
 	public void onClick$btnSalvarParamRecoleccion(Event ev) throws InterruptedException {
 		importeInicial.getValue();
-		importeAdicional.getValue();
+		//importeAdicional.getValue();
 		try {
 			ParamRecoleccion paramRecoleccion = new ParamRecoleccion();
 			paramRecoleccion.setImporteinicial(importeInicial.getValueDecimal());
-			paramRecoleccion.setImporteadicional(importeAdicional.getValueDecimal());
+			paramRecoleccion.setImporteadicional(BigDecimal.ZERO);
 			paramRecoleccion.setImporteBase(importeBase == null ? null : importeBase.getValueDecimal());
 
 			Boolean achou = Boolean.FALSE;
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/ParamRecoleccionRender.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/ParamRecoleccionRender.java
index 7461dddab..a5da45c24 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/ParamRecoleccionRender.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/ParamRecoleccionRender.java
@@ -21,13 +21,9 @@ public class ParamRecoleccionRender implements ListitemRenderer {
         Listcell lc = new Listcell(tm.getImporteinicial() == null ? "" : tm.getImporteinicial().setScale(2).toString());
         lc.setParent(lstm);
 
-        lc = new Listcell(tm.getImporteadicional() == null ? "" : tm.getImporteadicional().setScale(2).toString());
-        lc.setParent(lstm);
-        
         lc = new Listcell(tm.getImporteBase() == null ? "" : tm.getImporteBase().setScale(2).toString());
         lc.setParent(lstm);
 
-
         lstm.setAttribute("data", tm);
     }
 }
diff --git a/web/gui/catalogos/editarPuntoVenta.zul b/web/gui/catalogos/editarPuntoVenta.zul
index 3f59e74a9..7dfdfc0fd 100644
--- a/web/gui/catalogos/editarPuntoVenta.zul
+++ b/web/gui/catalogos/editarPuntoVenta.zul
@@ -1400,13 +1400,6 @@
 									precision="7" scale="2" constraint="no empty" />
 
 							</row>
-							<row>
-								<label
-									value="${c:l('editarPuntoVentaController.lblAdicional.value')}" />
-								<textbox id="importeAdicional"
-									use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
-									precision="7" scale="2" constraint="no empty" />
-							</row>
 							<row>
 								<label 
 									value="${c:l('editarPuntoVentaController.lblBase.value')}" />
@@ -1434,7 +1427,6 @@
 						vflex="true" multiple="false">
 						<listhead sizable="true">
 							<listheader image="/gui/img/builder.gif" label="${c:l('editarPuntoVentaController.lblInicial.value')}" />
-							<listheader image="/gui/img/builder.gif" label="${c:l('editarPuntoVentaController.lblAdicional.value')}" />
 							<listheader image="/gui/img/builder.gif" label="${c:l('editarPuntoVentaController.lblBase.value')}" />
 						</listhead>
 					</listbox>

From 957ffe1a1cf1d8205a0a923e984b3cbf860d4807 Mon Sep 17 00:00:00 2001
From: "aurora.cuaquentzi" <aurora.cuaquentzi@RJMX76YYY93.mex01.local>
Date: Fri, 19 Jul 2024 13:23:18 -0600
Subject: [PATCH 2/2] bug#AL-4505 Bolivariano - Sangria. dev:Lukas qua:

---
 pom.xml                                                   | 2 +-
 .../catalogos/EditarPuntoVentaController.java             | 4 ++--
 .../web/utilerias/render/ParamRecoleccionRender.java      | 4 ----
 web/gui/catalogos/editarPuntoVenta.zul                    | 8 --------
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6f3527cfe..5c513d2ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.114.0</version>
+	<version>1.115.0</version>
 	<packaging>war</packaging> 
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
index b0ea9e2ec..aa1b7507c 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
@@ -2822,11 +2822,11 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 
 	public void onClick$btnSalvarParamRecoleccion(Event ev) throws InterruptedException {
 		importeInicial.getValue();
-		importeAdicional.getValue();
+		//importeAdicional.getValue();
 		try {
 			ParamRecoleccion paramRecoleccion = new ParamRecoleccion();
 			paramRecoleccion.setImporteinicial(importeInicial.getValueDecimal());
-			paramRecoleccion.setImporteadicional(importeAdicional.getValueDecimal());
+			paramRecoleccion.setImporteadicional(BigDecimal.ZERO);
 			paramRecoleccion.setImporteBase(importeBase == null ? null : importeBase.getValueDecimal());
 
 			Boolean achou = Boolean.FALSE;
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/ParamRecoleccionRender.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/ParamRecoleccionRender.java
index 7461dddab..a5da45c24 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/ParamRecoleccionRender.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/ParamRecoleccionRender.java
@@ -21,13 +21,9 @@ public class ParamRecoleccionRender implements ListitemRenderer {
         Listcell lc = new Listcell(tm.getImporteinicial() == null ? "" : tm.getImporteinicial().setScale(2).toString());
         lc.setParent(lstm);
 
-        lc = new Listcell(tm.getImporteadicional() == null ? "" : tm.getImporteadicional().setScale(2).toString());
-        lc.setParent(lstm);
-        
         lc = new Listcell(tm.getImporteBase() == null ? "" : tm.getImporteBase().setScale(2).toString());
         lc.setParent(lstm);
 
-
         lstm.setAttribute("data", tm);
     }
 }
diff --git a/web/gui/catalogos/editarPuntoVenta.zul b/web/gui/catalogos/editarPuntoVenta.zul
index 3f59e74a9..7dfdfc0fd 100644
--- a/web/gui/catalogos/editarPuntoVenta.zul
+++ b/web/gui/catalogos/editarPuntoVenta.zul
@@ -1400,13 +1400,6 @@
 									precision="7" scale="2" constraint="no empty" />
 
 							</row>
-							<row>
-								<label
-									value="${c:l('editarPuntoVentaController.lblAdicional.value')}" />
-								<textbox id="importeAdicional"
-									use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
-									precision="7" scale="2" constraint="no empty" />
-							</row>
 							<row>
 								<label 
 									value="${c:l('editarPuntoVentaController.lblBase.value')}" />
@@ -1434,7 +1427,6 @@
 						vflex="true" multiple="false">
 						<listhead sizable="true">
 							<listheader image="/gui/img/builder.gif" label="${c:l('editarPuntoVentaController.lblInicial.value')}" />
-							<listheader image="/gui/img/builder.gif" label="${c:l('editarPuntoVentaController.lblAdicional.value')}" />
 							<listheader image="/gui/img/builder.gif" label="${c:l('editarPuntoVentaController.lblBase.value')}" />
 						</listhead>
 					</listbox>