From aa1d7582d11b0267a003a59b7c92fed450756f8d Mon Sep 17 00:00:00 2001
From: "lucas.taia" <lucas.taia@BHN330100005.bh01.local>
Date: Tue, 27 Dec 2022 19:00:03 -0300
Subject: [PATCH 1/2] bug#AL-1972

---
 pom.xml                                             | 13 ++++++++++---
 .../seguridad/EditarEstacionController.java         |  8 --------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index df642668e..268c85d96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	
+	<properties>
+		<ventaboletosadm.version>1.0.23</ventaboletosadm.version>
+		<modelWeb.version>1.0.17</modelWeb.version>
+		<flyway.version>1.0.7</flyway.version>
+	</properties>
+	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.0.22</version>
+	<version>${ventaboletosadm.version}</version>		
 	<packaging>war</packaging>
 
 	<distributionManagement>
@@ -55,13 +62,13 @@
 		<dependency>
 			<groupId>br.com.rjconsultores</groupId>
 			<artifactId>ModelWeb</artifactId>
-			<version>1.0.16</version>			
+			<version>${modelWeb.version}</version>		
 		</dependency>
 		
 		<dependency>
 			<groupId>br.com.rjconsultores</groupId>
 			<artifactId>Flyway</artifactId>
-			<version>1.0.7</version>
+			<version>${flyway.version}</version>	
 		</dependency>
 		
 		<dependency>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java
index 2b762c01b..bb38c6fce 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java
@@ -272,14 +272,6 @@ public class EditarEstacionController extends MyGenericForwardComposer {
 	private List<String> getTiposImpressora() {
 		List<String> tiposImpressora = new ArrayList<String>();
 		for (TipoImpressora tipo : TipoImpressora.values()) {
-
-			if (tipo.equals(TipoImpressora.MACON)) {
-				boolean isVendaMacon = ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_VENDA_MACON.getDescricao(), Boolean.TRUE);
-				if (!isVendaMacon) {
-					continue;
-				}
-			}
-
 			tiposImpressora.add(tipo.getNome());
 		}
 		return tiposImpressora;

From 4ae57d2fe37112a4f3f1f58365d8f5e8d3e06abc Mon Sep 17 00:00:00 2001
From: "lucas.taia" <lucas.taia@BHN330100005.bh01.local>
Date: Thu, 29 Dec 2022 10:48:53 -0300
Subject: [PATCH 2/2] bug#AL-1972

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 268c85d96..d537eb0d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,8 +2,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	
 	<properties>
-		<ventaboletosadm.version>1.0.23</ventaboletosadm.version>
-		<modelWeb.version>1.0.17</modelWeb.version>
+		<ventaboletosadm.version>1.0.24</ventaboletosadm.version>
+		<modelWeb.version>1.0.18</modelWeb.version>
 		<flyway.version>1.0.7</flyway.version>
 	</properties>