From 30dca49f11fc16c63becb6e280087c76f4a87514 Mon Sep 17 00:00:00 2001
From: celio <celio.souza@totvs.com.br>
Date: Mon, 7 Oct 2024 18:27:32 -0300
Subject: [PATCH] fixes bug#AL-4905

---
 pom.xml                                               |  2 +-
 .../pricing/EditarPricingController.java              | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index e7ef939b3..4528f545e 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.152.2</version>
+	<version>1.152.3</version>
 	<packaging>war</packaging> 
     
 	<properties>
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 950714dc0..8006b18b1 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
@@ -605,7 +605,9 @@ public class EditarPricingController extends PricingController {
 			if (pricing.getIndreservable() == Boolean.FALSE) {
 				rdReserNo.setChecked(true);
 			}
-			if (pricing.getDescuentoporcentaje() != null) {
+			Boolean isDescPorcentagem = isDescPorcentagem();
+			
+			if (isDescPorcentagem) {
 				radioPor.setChecked(true);
 			}
 			
@@ -618,7 +620,7 @@ public class EditarPricingController extends PricingController {
 				chkIndSafer.setChecked(pricing.getIndSafer());
 			}		
 			
-			if (lsPricingImporte.size() > 0) {
+			if (!isDescPorcentagem) {
 				radioImp.setChecked(true);
 				onClick$radioImp(null);
 			} else {
@@ -736,6 +738,11 @@ public class EditarPricingController extends PricingController {
 		}
 	}
 
+	private boolean isDescPorcentagem() {
+		return (pricing.getDescuentoporcentaje() != null || pricing.getDescuentoporcredondo() != null)
+										&& (lsPricingImporte == null || lsPricingImporte.isEmpty() || lsPricingImporte.size() < 0);
+	}
+
 	private void incluirCategoria(Categoria categoria) {
 		if (categoria != null && verificarCategoriaNaoAdicionada(categoria)) {
 			PricingCategoria pc = new PricingCategoria();