From fc0c9a648182adb3dc2bc9f11d93316a65536c56 Mon Sep 17 00:00:00 2001
From: celio <celio@rjconsultores.com.br>
Date: Wed, 17 May 2023 10:08:40 -0300
Subject: [PATCH] fixes bug#AL-2679

---
 pom.xml                                       |   2 +-
 .../impl/RelatorioPassagensAGR.java           |   4 ++--
 .../templates/RelatorioPassagensAGR.jasper    | Bin 50458 -> 50454 bytes
 .../templates/RelatorioPassagensAGR.jrxml     |   4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ba3ccdc07..771751e04 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.5.3</version>
+	<version>1.5.4</version>
 	<packaging>war</packaging>
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
index 08f033613..9108f353d 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
@@ -205,8 +205,8 @@ public class RelatorioPassagensAGR extends Relatorio {
 	
 	public static String capitalizeWords(String input) {
 	    StringBuilder output = new StringBuilder();
-	    boolean newWord = true;
-	    if(input != null || !input.isEmpty()) {
+	    boolean newWord = input == null || input.isEmpty() ? false : true;
+	    if(newWord) {
 	    	for (int i = 0; i < input.length(); i++) {
 		        char c = input.charAt(i);
 
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jasper
index a2dbb203bfa375b3a4e756e9eccf1e5891921ea2..891971fa32b1cd19305c38b09681057347edf7bf 100644
GIT binary patch
delta 516
zcmbQ$#XPNxdBaU-VbPMzf_#_M;^h3il6<GsywtSJ&2OFM<*-U9B+WEr6r8+kvYMcY
zv5|$5xsi#HNxZRziJ_Un=8u!5SY)KrGE;L>;xP?P&di_8Iir5_@)?`h>#<l0l;>dN
zU}WIWODriZO07x^PAw|SOa=;aF*0x$B~~To2j?eeCgyN3@-Q;6B<B@maWL`$rSeL1
zQ;YI_GV?MLIT!^P83Z5#o++t$C7CISDXAQcLW~T2$r*`dsgB91#l`tfOaZQ&Z!h>Q
z#Mm`?;z4Qtwrz}a4=_6WE@$|uwS{5AWX3ItjD3@351I2%g3AN~WqKyB+#=1`F}ePb
z-Dc*k8(6iwwlOXNYh)A!O4q@8>_8sSP>3AV(0jW;hC1vv*9IC2l>r+H=Q#s)&4cqy
jfxM2*i*~<bCC`<c>kox8iD1N134_sOLw1?TEJwuvD;BpB

delta 474
zcmbQ%#XPHvdBaU-5wViYf_#_M;^h3il6<GsywtSAYd61fmY2gWBbPMOkWqN@j>&3*
z#)c*)hDN3qCPwk*2FAu_CY#?+mSUN#KBHDvCM`2HCnX+>(aD+ln-|U4!fwx>msnC-
zlv<S-oLW?tnViqT$ic|KU6fdrm>-;<oSB%z!N|qPz>=I-kj25s1C+`u%}p)J_sPu5
zNaSGTo4jFxsGa~L17C7RVp*zVa%ypLzEglJ2cr-p12!*#?7hC=w-95;<lckQ{FAmZ
z&ON~B?7N)dr`8sRzR7<#Co=X-j^AR=KLIWi2$boX9Dhifv2F9gE$>)?S~u(hYh8k@
z_0}$sR-4`C+CZ&P8L(D3&lzaYJUGu3$ZOj?Z#URLGTbux;1;{hI}eF7VMf5@heu2S
DU9Yk4

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jrxml
index 8d852df96..6c5fd23ad 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jrxml
@@ -24,7 +24,7 @@
 	<field name="razaoSocial" class="java.lang.String"/>
 	<field name="cnpj" class="java.lang.String"/>
 	<field name="numeroPassaporte" class="java.lang.String"/>
-	<field name="tipoDescontoBenefício" class="java.lang.String"/>
+	<field name="tipoDescontoBeneficio" class="java.lang.String"/>
 	<field name="nomePassageiro" class="java.lang.String"/>
 	<field name="numeroIdentidade" class="java.lang.String"/>
 	<field name="orgaoExpedidor" class="java.lang.String"/>
@@ -382,7 +382,7 @@
 					<bottomPen lineWidth="0.75"/>
 				</box>
 				<textElement textAlignment="Center"/>
-				<textFieldExpression><![CDATA[$F{tipoDescontoBenefício}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{tipoDescontoBeneficio}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement uuid="ba84d11d-f63a-4fa5-9ac2-46488f040cdd" stretchType="RelativeToTallestObject" x="528" y="2" width="82" height="17" isPrintWhenDetailOverflows="true"/>