From dd164e2ed8f9b942ed77e4663b901d1005595ce4 Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Fri, 12 Apr 2024 11:47:08 -0300
Subject: [PATCH 1/2] fixes bug#AL-3947

---
 pom.xml                                       |   2 +-
 .../templates/RelatorioReceitaServico.jasper  | Bin 46927 -> 46927 bytes
 .../templates/RelatorioReceitaServico.jrxml   |  62 +++++++++---------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae8fc1a22..5a3892e5c 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.63.2</version> 
+	<version>1.63.3</version> 
 	<packaging>war</packaging>  
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper
index b34b94c2fee1d04e4ab2a6437454fc58fc890661..354bb6b7c3fdcf306222b4aa5e265b463a70a6da 100644
GIT binary patch
delta 467
zcmX^Aj_Le6rVYDTg?$;IKm<rL1v4-(mu^1G`c{_J9mr*wtf-*5`GqnoBdaEm>kZ~g
zt1>dO`T)68H!G^8F|mpQ^;m#qwra35GM0du&opH?7#Sx!da7>LFgnfzWr~{GF+!P@
zX0|Zq9do#-gC$&av6UB0fv}A`jM-r84P$<^vtpe5z=WMsgMoqZ4$$?ClN)`NHpe=!
zF;3p^EjYQvQI*kSvVoa2C)g`s1t9l4b~Iz;1bYWA<nCO<$O-lmT<D{VBg~=*HycLQ
z61dDh_a>msW=GF#MozHb;WD?pEMa;qeLzm$+~}Lj$jG<(z26me&In+TeFdszn7pCF
zbF*mqT4q+T(Bw50zMDm=W0@I!Hy71aF)~JMep_$CCtzu8WNB(>YH1d4Zfa<5Y_!?1
U@1}+zx@gJdk4bWqEw_sS05|P-ssI20

delta 478
zcmX^Aj_Le6rVYDTg}oS{Km<rL1v4-(7i~Vv`c{_J6Ub$mtf-*5`GqnoBdZ#a>kH;e
zt1>dO`U1IAHY=*7F|i5(^;m#qwra35G8TiG&opH?Cf}Cen(XB%vsuIFI1?koWJgcc
z&7!7uj8JB!nJtWY$J~x_@?KepY6nZW_+l$Bm=a+dcNnw5)|+v1ydp&PM>{J<0Y-=)
zG#D5d?|_(-8-0~F$2zbvPG06GIJv}8l`(m;ftfTX*iT>uAh$erG-Koh`wK4Q?p(vj
z3HBRY=%b4x%;E?)8%EY*xXeEHCZNn_N6&0VPH-T=Wo~&{GEU|fgt*Ys2jue2jlQ{z
zj69p)`(07z3<ZYXSFq|06`q?#%hxiqf`ulpsqoz_QXR|8=(V}1u8NT{bo1MK6Fvb8
lGgC7&OCwXWcw=*O3v-jrhJ80R1kpuHCVxzln{2sV3;-#tde;B|

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml
index aa80b2185..39bd81e33 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioReceitaServico" pageWidth="882" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="842" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioReceitaServico" pageWidth="885" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="845" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
 	<property name="ireport.zoom" value="1.331000000000001"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -95,7 +95,7 @@
 				<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
-				<reportElement uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9" mode="Transparent" x="757" y="0" width="85" height="13" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9" mode="Transparent" x="757" y="0" width="88" height="13" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -111,7 +111,7 @@
 				<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
-				<reportElement uuid="314e312c-8f24-42de-8354-3c1f7241a985" mode="Transparent" x="757" y="13" width="85" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="314e312c-8f24-42de-8354-3c1f7241a985" mode="Transparent" x="757" y="13" width="88" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -127,7 +127,7 @@
 				<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda" x="0" y="51" width="842" height="14"/>
+				<reportElement uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda" x="0" y="51" width="845" height="14"/>
 				<box>
 					<topPen lineWidth="0.75"/>
 					<bottomPen lineWidth="0.75"/>
@@ -138,7 +138,7 @@
 				<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="469acc35-aa0a-41d9-ad44-544cf484879a" mode="Transparent" x="757" y="28" width="85" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="469acc35-aa0a-41d9-ad44-544cf484879a" mode="Transparent" x="757" y="28" width="88" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="7" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -250,7 +250,7 @@
 				<text><![CDATA[Tipo]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="10f27b7d-5cc9-423c-a196-330c78cdb69e" x="516" y="0" width="73" height="12"/>
+				<reportElement uuid="10f27b7d-5cc9-423c-a196-330c78cdb69e" x="516" y="0" width="71" height="12"/>
 				<box>
 					<bottomPen lineWidth="0.75"/>
 				</box>
@@ -260,7 +260,7 @@
 				<text><![CDATA[Agência]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="f2097833-6bd3-4523-b457-44ed6cc4abd6" x="589" y="0" width="38" height="12"/>
+				<reportElement uuid="f2097833-6bd3-4523-b457-44ed6cc4abd6" x="587" y="0" width="41" height="12"/>
 				<box>
 					<bottomPen lineWidth="0.75"/>
 				</box>
@@ -270,7 +270,7 @@
 				<text><![CDATA[Data]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="44b2bf55-871a-4eaa-97d4-74bee2a89769" x="660" y="0" width="77" height="12"/>
+				<reportElement uuid="44b2bf55-871a-4eaa-97d4-74bee2a89769" x="661" y="0" width="76" height="12"/>
 				<box>
 					<bottomPen lineWidth="0.75"/>
 				</box>
@@ -290,7 +290,7 @@
 				<text><![CDATA[Nr bilhete ]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="2bd47a58-e591-4b32-bdd4-fa43ece0c581" x="824" y="0" width="18" height="12"/>
+				<reportElement uuid="2bd47a58-e591-4b32-bdd4-fa43ece0c581" x="824" y="0" width="21" height="12"/>
 				<box>
 					<bottomPen lineWidth="0.75"/>
 				</box>
@@ -300,7 +300,7 @@
 				<text><![CDATA[Status]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="bceca474-7703-4bf0-a0da-d8e15b70aeca" x="627" y="0" width="33" height="12"/>
+				<reportElement uuid="bceca474-7703-4bf0-a0da-d8e15b70aeca" x="628" y="0" width="33" height="12"/>
 				<box>
 					<bottomPen lineWidth="0.75"/>
 				</box>
@@ -342,135 +342,135 @@
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="12" splitType="Stretch">
+		<band height="14" splitType="Stretch">
 			<textField>
-				<reportElement uuid="b15ada19-a1c0-4feb-9734-3a6c624bbfe6" x="39" y="0" width="51" height="12"/>
+				<reportElement uuid="b15ada19-a1c0-4feb-9734-3a6c624bbfe6" x="39" y="1" width="51" height="12"/>
 				<textElement>
 					<font size="7" isBold="true" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" x="90" y="0" width="66" height="12"/>
+				<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" x="90" y="1" width="66" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="fd8ae360-3ae2-4adc-8c3a-fcfb19551d22" x="156" y="0" width="30" height="12"/>
+				<reportElement uuid="fd8ae360-3ae2-4adc-8c3a-fcfb19551d22" x="156" y="1" width="30" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3" x="186" y="0" width="30" height="12"/>
+				<reportElement uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3" x="186" y="1" width="30" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="7265d085-4188-44a0-8e04-e5efdb0d5ccf" x="216" y="0" width="68" height="12"/>
+				<reportElement uuid="7265d085-4188-44a0-8e04-e5efdb0d5ccf" x="216" y="1" width="68" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{classe}]]></textFieldExpression>
 			</textField>
 			<textField pattern="¤ #,##0.00">
-				<reportElement uuid="6430daa4-d318-4f4a-87ff-2ea4de9d492e" x="284" y="0" width="41" height="12"/>
+				<reportElement uuid="6430daa4-d318-4f4a-87ff-2ea4de9d492e" x="284" y="1" width="41" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression>
 			</textField>
 			<textField pattern="¤ #,##0.00">
-				<reportElement uuid="49faea3b-2ce4-469a-b07c-3b4869aaa9e5" x="361" y="0" width="34" height="12"/>
+				<reportElement uuid="49faea3b-2ce4-469a-b07c-3b4869aaa9e5" x="361" y="1" width="34" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tut}]]></textFieldExpression>
 			</textField>
 			<textField pattern="¤ #,##0.00">
-				<reportElement uuid="16461919-04ea-48df-af5c-7f0d7dcb7fab" x="395" y="0" width="41" height="12"/>
+				<reportElement uuid="16461919-04ea-48df-af5c-7f0d7dcb7fab" x="395" y="1" width="41" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
 			</textField>
 			<textField pattern="¤ #,##0.00">
-				<reportElement uuid="97be07ba-bdb1-4bf2-91af-554b580ee3fa" x="436" y="0" width="40" height="12"/>
+				<reportElement uuid="97be07ba-bdb1-4bf2-91af-554b580ee3fa" x="436" y="1" width="40" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="8cf0c102-4e42-4f6d-8922-8edc808fdc0f" stretchType="RelativeToTallestObject" x="476" y="0" width="40" height="12" isPrintWhenDetailOverflows="true"/>
+			<textField isBlankWhenNull="false">
+				<reportElement uuid="8cf0c102-4e42-4f6d-8922-8edc808fdc0f" stretchType="RelativeToTallestObject" x="476" y="1" width="40" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="0ecedfc0-febb-40e0-b5ca-168b5a296646" x="516" y="0" width="73" height="12"/>
+				<reportElement uuid="0ecedfc0-febb-40e0-b5ca-168b5a296646" x="516" y="1" width="71" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="8229beec-daa6-4357-a4c9-f475d7a873aa" x="589" y="0" width="38" height="12"/>
+				<reportElement uuid="8229beec-daa6-4357-a4c9-f475d7a873aa" x="587" y="1" width="41" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[new SimpleDateFormat("dd/MM/yyyy").format($F{dataHoraCompra})]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="8e67c346-5c72-4a92-beee-9dd9ad647bb1" x="660" y="0" width="77" height="12"/>
+				<reportElement uuid="8e67c346-5c72-4a92-beee-9dd9ad647bb1" x="661" y="1" width="76" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{passageiro}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="9a639996-146c-42c9-a8fd-f947a59310f4" x="785" y="0" width="39" height="12"/>
+				<reportElement uuid="9a639996-146c-42c9-a8fd-f947a59310f4" x="785" y="1" width="39" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nrBilhete}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="8d419689-a353-4332-8e39-222dde198168" x="627" y="0" width="33" height="12"/>
+				<reportElement uuid="8d419689-a353-4332-8e39-222dde198168" x="628" y="1" width="33" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[new SimpleDateFormat("HH:mm:ss").format($F{dataHoraCompra})]]></textFieldExpression>
 			</textField>
 			<textField pattern="¤ #,##0.00">
-				<reportElement uuid="48c368c2-dd11-4724-a5e9-b3f139464d4a" x="325" y="0" width="36" height="12"/>
+				<reportElement uuid="48c368c2-dd11-4724-a5e9-b3f139464d4a" x="325" y="1" width="36" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{preciobase}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="1f6449f5-835f-41f2-8c41-94eb91e54fa2" x="824" y="0" width="18" height="12"/>
+				<reportElement uuid="1f6449f5-835f-41f2-8c41-94eb91e54fa2" x="824" y="1" width="21" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[""]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa" x="1" y="0" width="38" height="12"/>
+				<reportElement uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa" x="1" y="1" width="38" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{data}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="7dedf3ee-5d5b-48e0-b56c-5fea86d1d80c" stretchType="RelativeToBandHeight" x="737" y="0" width="48" height="12"/>
+				<reportElement uuid="7dedf3ee-5d5b-48e0-b56c-5fea86d1d80c" stretchType="RelativeToBandHeight" x="737" y="1" width="48" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>

From 00dab3b086aca8fe3c2fef111e410784f8e21312 Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Fri, 12 Apr 2024 16:47:18 -0300
Subject: [PATCH 2/2] fixes bug#AL-3947

---
 pom.xml                                       |   2 +-
 .../templates/RelatorioReceitaServico.jasper  | Bin 46927 -> 46935 bytes
 .../templates/RelatorioReceitaServico.jrxml   |  52 +++++++++---------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5a3892e5c..78690c0bb 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.63.3</version> 
+	<version>1.63.4</version> 
 	<packaging>war</packaging>  
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper
index 354bb6b7c3fdcf306222b4aa5e265b463a70a6da..c613cdc72b55bc5dc133250b9515a3d9fa854524 100644
GIT binary patch
delta 1510
zcmZ|P%TE(Q9Ki9JMGv3^t7uFFO$`n8U@V2*+RCH#!O+GwF;dYOLQ=evLLfvF(gos)
z7(M(h=+&h0XtE}rG$tNALbwnfo;eU9{0GkbW`G%XXwqNWe)sX|?q*i@ob^5DtCNJS
zt4&bIw*~R!ABPfHDBgt8Y!oiL%r8ul8pSa<In6(lXN3G7p5(8iP>`W?T6l3<cxegz
zz<8Qbc?#HaZ$P~ifpgvvm*w&?c;hjDM4TK)*`kuwqSAw*(u1K=;e@K8M#~Uox1pM1
zO0}J0{wtxvQL(6GwW#!9sPtf{R0yjos9L)_1V7rvEp2rugG{>UPYD{1s)Z)2g{B9C
zrU!$jLYP+Nv^KnzUgq$kea<kyCS*9~EHYUwGCdeFJs2_-!m>HMXdmwlt6O=gm-+96
z3dfQ~C96fH2ScR?L#0AkwS=n1z9&jG-^ct<LWN`5qLS63(u1MWgP~F(tXe+0i?jV@
z7>nY%0SEoe{~~NS>K2=<7MmUnn;s0C3SnCvuh`DOQ@mpB;?aMd9iiV~H9O1a;o~=x
zi^azI-iV=h#2Q2hInUqn#RzfEh>v`=!GrwG?c#I0alhj%|C3}K65ciV*KrZoO!nX{
zJwD;?L%HqFqt4@P8#@VUh^Rxxg6D%-3cqg2CHE&=<huvC{4|9RarxV3Ax)trBEO^`
vGqJ%!ae~t3V87Ho(BdXiZZhHajCFf%S27WFz2A&qIPv2Q98|7D`ummtPQBNn

delta 1222
zcmZwGPe>F|90%|>WB#2iRDv)sf!it+wX@8QYw6DV@2y&b>`Fw$uHOBJdy?2XbdW$H
zexjZPN%X4C!LxMm=rO$(9z?V*Aw-AX`~BX)Of!4<@%!!f&3xX2dEc(|<12knH#H5m
zc+BlEk92AwY4MueJgaCqcyHbH+C;9Ui~gNk5FvZT*w@0G_~A+{6ub@xaBe+@Cj(8;
znaU|-J;jX)`4pBsOlDeYXa*sTQX3)pgMg$0u_4^v8*giQDA{F&{;|0+B~dITL}^Bp
z+6dGi1W*-((2_tO!LKel?E@&Lhm2VXW0^*nW`wDYfc-%LRzV1!M!3+;)rk+gx$#!Q
zSQZhc8DVN8V1E#RRS<#~5k7cYP;lZIH$F-j%M!vgBTQ`s><<F43PSJ_!ttJQ1#k9n
zV?)AN))1x{VQM2_e-MCG5Q5hbUhSPw@a+sYb|j2t8)2FerZxih2LV_GA$S|%YA26y
zD>PW0P;th!FOr16&Q18~ycCoC1k2f&xW@bTy?V}=euFWF*ByRj&+tN?_O-*wyJje+
z8sM_Mj*jAv_J7dSseTX8!i&MUx3E6WSXGnvDz`M`h{f&}-&N1JGs9zE`+X$swb|$5
zqm+89`}u{~`z`l+ESb5JG}BhXN~empm9Ud$Ez>mi5az4fpz^8Kom$!NX#Q_WnVE2Z
KIR+yKjsF1sIDmox

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml
index 39bd81e33..64608438a 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml
@@ -342,135 +342,135 @@
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="14" splitType="Stretch">
+		<band height="13" splitType="Stretch">
 			<textField>
-				<reportElement uuid="b15ada19-a1c0-4feb-9734-3a6c624bbfe6" x="39" y="1" width="51" height="12"/>
+				<reportElement uuid="b15ada19-a1c0-4feb-9734-3a6c624bbfe6" x="39" y="0" width="51" height="12"/>
 				<textElement>
 					<font size="7" isBold="true" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" x="90" y="1" width="66" height="12"/>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" stretchType="RelativeToTallestObject" x="90" y="0" width="66" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="fd8ae360-3ae2-4adc-8c3a-fcfb19551d22" x="156" y="1" width="30" height="12"/>
+				<reportElement uuid="fd8ae360-3ae2-4adc-8c3a-fcfb19551d22" x="156" y="0" width="30" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3" x="186" y="1" width="30" height="12"/>
+				<reportElement uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3" x="186" y="0" width="30" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="7265d085-4188-44a0-8e04-e5efdb0d5ccf" x="216" y="1" width="68" height="12"/>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="7265d085-4188-44a0-8e04-e5efdb0d5ccf" stretchType="RelativeToTallestObject" x="216" y="0" width="68" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{classe}]]></textFieldExpression>
 			</textField>
 			<textField pattern="¤ #,##0.00">
-				<reportElement uuid="6430daa4-d318-4f4a-87ff-2ea4de9d492e" x="284" y="1" width="41" height="12"/>
+				<reportElement uuid="6430daa4-d318-4f4a-87ff-2ea4de9d492e" x="284" y="0" width="41" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression>
 			</textField>
 			<textField pattern="¤ #,##0.00">
-				<reportElement uuid="49faea3b-2ce4-469a-b07c-3b4869aaa9e5" x="361" y="1" width="34" height="12"/>
+				<reportElement uuid="49faea3b-2ce4-469a-b07c-3b4869aaa9e5" x="361" y="0" width="34" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tut}]]></textFieldExpression>
 			</textField>
-			<textField pattern="¤ #,##0.00">
-				<reportElement uuid="16461919-04ea-48df-af5c-7f0d7dcb7fab" x="395" y="1" width="41" height="12"/>
+			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
+				<reportElement uuid="16461919-04ea-48df-af5c-7f0d7dcb7fab" x="395" y="0" width="41" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
 			</textField>
 			<textField pattern="¤ #,##0.00">
-				<reportElement uuid="97be07ba-bdb1-4bf2-91af-554b580ee3fa" x="436" y="1" width="40" height="12"/>
+				<reportElement uuid="97be07ba-bdb1-4bf2-91af-554b580ee3fa" x="436" y="0" width="40" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="false">
-				<reportElement uuid="8cf0c102-4e42-4f6d-8922-8edc808fdc0f" stretchType="RelativeToTallestObject" x="476" y="1" width="40" height="12"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="8cf0c102-4e42-4f6d-8922-8edc808fdc0f" stretchType="RelativeToTallestObject" x="476" y="0" width="40" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="0ecedfc0-febb-40e0-b5ca-168b5a296646" x="516" y="1" width="71" height="12"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="0ecedfc0-febb-40e0-b5ca-168b5a296646" stretchType="RelativeToTallestObject" isPrintRepeatedValues="false" x="516" y="0" width="71" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="8229beec-daa6-4357-a4c9-f475d7a873aa" x="587" y="1" width="41" height="12"/>
+				<reportElement uuid="8229beec-daa6-4357-a4c9-f475d7a873aa" x="587" y="0" width="41" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[new SimpleDateFormat("dd/MM/yyyy").format($F{dataHoraCompra})]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="8e67c346-5c72-4a92-beee-9dd9ad647bb1" x="661" y="1" width="76" height="12"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="8e67c346-5c72-4a92-beee-9dd9ad647bb1" stretchType="RelativeToTallestObject" x="661" y="0" width="76" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{passageiro}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="9a639996-146c-42c9-a8fd-f947a59310f4" x="785" y="1" width="39" height="12"/>
+				<reportElement uuid="9a639996-146c-42c9-a8fd-f947a59310f4" x="785" y="0" width="39" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nrBilhete}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="8d419689-a353-4332-8e39-222dde198168" x="628" y="1" width="33" height="12"/>
+				<reportElement uuid="8d419689-a353-4332-8e39-222dde198168" x="628" y="0" width="33" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[new SimpleDateFormat("HH:mm:ss").format($F{dataHoraCompra})]]></textFieldExpression>
 			</textField>
 			<textField pattern="¤ #,##0.00">
-				<reportElement uuid="48c368c2-dd11-4724-a5e9-b3f139464d4a" x="325" y="1" width="36" height="12"/>
+				<reportElement uuid="48c368c2-dd11-4724-a5e9-b3f139464d4a" x="325" y="0" width="36" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{preciobase}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="1f6449f5-835f-41f2-8c41-94eb91e54fa2" x="824" y="1" width="21" height="12"/>
+				<reportElement uuid="1f6449f5-835f-41f2-8c41-94eb91e54fa2" x="824" y="0" width="21" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[""]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa" x="1" y="1" width="38" height="12"/>
+				<reportElement uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa" x="1" y="0" width="38" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{data}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="7dedf3ee-5d5b-48e0-b56c-5fea86d1d80c" stretchType="RelativeToBandHeight" x="737" y="1" width="48" height="12"/>
+				<reportElement uuid="7dedf3ee-5d5b-48e0-b56c-5fea86d1d80c" stretchType="RelativeToBandHeight" x="737" y="0" width="48" height="12"/>
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>