From 68c64a87d776f12060ac204a324db2669a8c9f98 Mon Sep 17 00:00:00 2001
From: "valdir.cordeiro" <valdir.cordeiro@BHN330100045.bh01.local>
Date: Tue, 13 Jun 2023 10:00:48 -0300
Subject: [PATCH] =?UTF-8?q?bug#al-2761=20GLPI=2064102=20-=20{Projeto}=20-?=
 =?UTF-8?q?=20Espec=20Pricing=20Conex=C3=A3o=20-=20Aguia=20Branca=20dev:?=
 =?UTF-8?q?=20qua:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 6 +++---
 .../GerarConexionPorRutaController.java                   | 8 ++++----
 .../controladores/pricing/EditarPricingController.java    | 3 ++-
 web/gui/pricing/editarPricingOcupaAntecipa.zul            | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 262792e76..aa2162528 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.7.9</version>
+	<version>1.7.10</version>
 	<packaging>war</packaging>
   
 	<properties>
-		<modelWeb.version>1.5.2</modelWeb.version>
-		<flyway.version>1.4.0</flyway.version>
+		<modelWeb.version>1.5.3</modelWeb.version>
+		<flyway.version>1.4.1</flyway.version>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GerarConexionPorRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GerarConexionPorRutaController.java
index 810d01107..afb4b7fca 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GerarConexionPorRutaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GerarConexionPorRutaController.java
@@ -425,16 +425,16 @@ public class GerarConexionPorRutaController extends MyGenericForwardComposer {
 		adicionaLocalidadesExcluidas();
 		
 		removeLocalidadesExcluidas();
-		
 		//Atualizar o indPricing alterado pela tabela
-		for(ParadaVOConexionRuta loc : localidadesGeradas ) {
-			for(ConexionCtrl conCtrl : conexoesCtrl) {
+		localidades: for(ConexionCtrl conCtrl : conexoesCtrl) {
+			for(ParadaVOConexionRuta loc : localidadesGeradas ) {
 				if(isMesmaConexao(loc, conCtrl)) {
 					conCtrl.setIndPricing(loc.getConexionCtrl().getIndPricing());
+					continue localidades;
 				}
 			}
 		}
-		
+
 		conexionCtrlService.suscribirTodos(conexoesCtrl);
 		
 		List<ConexionDescuento> conexionDescontos = new ArrayList<>();
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
index 96ec203eb..e8604240f 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
@@ -926,7 +926,8 @@ public class EditarPricingController extends PricingController {
 			return false;
 		}
 				
-		if (verificarContemTodasRuta() && verificarContemTodas()) {		
+		//Quando existe pricing conexao permite cadastrar linha e trecho todas
+		if ( (lsPricingConexao == null || lsPricingConexao.isEmpty()) && verificarContemTodasRuta() && verificarContemTodas()) {
 			Messagebox.show(
 					Labels.getLabel("editarPricingController.MSG.noRutaTodasYTrechosTodos"),
 					Labels.getLabel("editarPricingController.window.title"),
diff --git a/web/gui/pricing/editarPricingOcupaAntecipa.zul b/web/gui/pricing/editarPricingOcupaAntecipa.zul
index a013be659..79b20b8d4 100644
--- a/web/gui/pricing/editarPricingOcupaAntecipa.zul
+++ b/web/gui/pricing/editarPricingOcupaAntecipa.zul
@@ -72,7 +72,7 @@
                             converter=com.rjconsultores.ventaboletos.web.utilerias.StringDecimalToDecimalConverter}" />
 					<label
 						value="${c:l('editarPricingController.importe.value')}" />
-					<textbox id="importe" precision="7" scale="2"
+					<textbox id="importe" precision="10" scale="2"
 						width="80%"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
 						value="@{winEditarPricingOcupaAntecipa$composer.pricingOcupaAntecipa.importe,