From 404aafc3fcb89fc6e24c0199c740b6a4d6d7cd9f Mon Sep 17 00:00:00 2001
From: valdevir <valdevir.silva@totvs.com.br>
Date: Fri, 31 Mar 2023 23:18:48 -0300
Subject: [PATCH] fixes bug #AL-2209

---
 pom.xml                                             |  2 +-
 .../catalogos/EditarFormaPagoController.java        | 13 +++++++++----
 web/gui/catalogos/editarFormaPago.zul               |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 81947e93b..5516082d7 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.0.91</version>
+	<version>1.0.92</version>
 	<packaging>war</packaging>
  
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java
index 7190ba6aa..4118267e5 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java
@@ -310,10 +310,15 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
 			formaPago.setIndProcessoEstorno(chkIndEstorno.isChecked());
 			formaPago.setIndVoucherRodoviaria(chkIndVoucherRodoviaria.isChecked());
 			formaPago.setIndTransferenciaReativacao(chkIndTransferenciaReativacao.isChecked());
-			
-			formaPago.setValorDesconto(valorDescontoBox.getValue());
-			formaPago.setPercentualDesconto(percentualDescontoBox.getValue());
-			formaPago.setIndPercentualDesconto(radioPor.isChecked() ? true : false);
+			if(radioPor.isChecked()) {
+				formaPago.setPercentualDesconto(percentualDescontoBox.getValue());				
+				formaPago.setValorDesconto(null);
+				formaPago.setIndPercentualDesconto(true);
+			}else {
+				formaPago.setIndPercentualDesconto(false);
+				formaPago.setValorDesconto(valorDescontoBox.getValue());
+				formaPago.setPercentualDesconto(null);
+			}
 				
 			if (formaPago.getFormapagoId() == null) {
 				List<FormaPago> lsFP =
diff --git a/web/gui/catalogos/editarFormaPago.zul b/web/gui/catalogos/editarFormaPago.zul
index 11be13bac..85cee7e83 100644
--- a/web/gui/catalogos/editarFormaPago.zul
+++ b/web/gui/catalogos/editarFormaPago.zul
@@ -144,14 +144,14 @@
 					<label 
 						value="${c:l('editarFormaPagoController.percentualDescontoFormaPagamento.label')}" />
 						<decimalbox id="percentualDescontoBox"
-							format="##,##%" constraint="no negative" maxlength="5" width="98%"
+							format="##,##%" constraint="no negative" maxlength="6" width="98%"
 							value="@{winEditarFormaPago$composer.formaPago.percentualDesconto}" />
 						
 				</row>
 				<row id="rowValorDesconto">
 					<label value="${c:l('editarFormaPagoController.valorDescontoFormaPagamento.label')}" />
 					<decimalbox id="valorDescontoBox"
-						width="98%" constraint="no negative" maxlength="5" format="#,##0.00"
+						width="98%" constraint="no negative" maxlength="6" format="#,##0.00"
 						value="@{winEditarFormaPago$composer.formaPago.valorDesconto}" />
 
 				</row>