From 93183868ea797a427bd060b549debd135b9cb405 Mon Sep 17 00:00:00 2001
From: walace <walace@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 3 Sep 2021 12:57:08 +0000
Subject: [PATCH] fixes bug#22871 qua:silvania dev:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@108601 d1611594-4594-4d17-8e1d-87c2c4800839
---
 ...RelatorioAcompanhamentoEquivalentes.jasper | Bin 129808 -> 129809 bytes
 .../RelatorioAcompanhamentoEquivalentes.jrxml |  44 +++++++++---------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jasper
index 49eeaa8c04f523577f22866cd5c3f1018caeea3e..345106e065acd49a896d867c8b8569a122b4e270 100644
GIT binary patch
delta 384
zcmbR6jeX)b_6_WUtZEEEFxfCnbhDyh3_B|ykf#RZYEE7)@r9Ka$TI=+&Psk^6$A2;
zLA=fHr8JFLg&7!_IVV5VmD+6X%cTV7%7A6_^LMdAWevlmHhYw2FhgY@>S}JjS0Tm3
z=m=J*RDH*RQF!zJ-K&|P3JRMwH{aM7zzB5~h#Pjmff4E~5ckMI7e=VNKwPuKv5ZiM
zfw%{c^soR82QkY}W&|(_Z+{@kc##omdf;Qt?f0b_(?o>?P4tY+EzQhL4NNT!%}fmp
zET%^oG8(Wj8(Erf?=oamQ(<ia`F;D=P{t}IMw9IZ5sX*Z#mvl&OiYaojEv*W&5VpK
x%-I<j85wjY7qZH1H%nlgI!h2;LCIvp+j7%+;u$%4y%Nh3lb!Q(3o>(3ivXDGXvqKo

delta 383
zcmbREjeWv5_6_WUtXd2}FxfCnbhDyh3_B|?kf#OYYEE7)@r9KK$TJ7?&Psk^6#?>6
zLA=fHr8JFLMHv{FIVV5VmD+6X%caCB2;|CvW%KiQu|j1H!=yHQlx8qPWgqHlZoXF`
z#l+|gR;W~c$AM9F^Z(tenV<>^n>9Dz*cZSEbry&lcEEuV>MRiV$UzrIsJlR1v%|5B
zP=|rI2aoiy01XE*%THzmFp6$}Ajx=<5o&tiW6kaNr5V#ig@p|D%uEfCfT8*Ha6?7|
zCPstp-G+>6Dy;P&uW#QL%2>t3XujPrg7FHwn5m(Kfq}V^p<%p{fw8%z0XqXDBZJQ5
pLROjW<_U~bX9=P!D4A?{TW&gUJR>KsS7KRWvU7fJL1s>B5dbjCXixwE

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml
index e64853288..a1863e408 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml
@@ -1,8 +1,8 @@
 <?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="RelatorioAcompanhamentoEquivalentes" pageWidth="858" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="838" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
-	<property name="ireport.zoom" value="1.6500000000000017"/>
+	<property name="ireport.zoom" value="4.279675059165008"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.y" value="297"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
 	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
@@ -530,7 +530,7 @@
 					<patternExpression><![CDATA[!$P{INDICADOR}.equals(6) ? "#,##0.00;-#,##0.00" : "###0"]]></patternExpression>
 				</textField>
 				<textField pattern="" isBlankWhenNull="true">
-					<reportElement uuid="da6f5a66-9208-4bd2-957c-ce7084ed4359" x="777" y="0" width="21" height="16"/>
+					<reportElement uuid="da6f5a66-9208-4bd2-957c-ce7084ed4359" x="777" y="0" width="19" height="16"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="5"/>
 					</textElement>
@@ -538,7 +538,7 @@
 					<patternExpression><![CDATA[!$P{INDICADOR}.equals(6) ? "#,##0.00;-#,##0.00" : "###0"]]></patternExpression>
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="7c3d5ad1-0b32-4024-81b4-065189471321" x="798" y="0" width="17" height="16"/>
+					<reportElement uuid="7c3d5ad1-0b32-4024-81b4-065189471321" x="796" y="0" width="19" height="16"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="5"/>
 					</textElement>
@@ -575,7 +575,7 @@
 				<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="MM/yyyy" isBlankWhenNull="false">
-				<reportElement uuid="4408d1db-05db-4538-944d-5561074f2706" mode="Transparent" x="55" y="35" width="639" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="4408d1db-05db-4538-944d-5561074f2706" mode="Transparent" x="52" y="35" width="642" 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"/>
@@ -583,7 +583,7 @@
 				<textFieldExpression><![CDATA[$P{DATA_MES}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="8109cd1c-5c2f-41f2-ab03-0f92e7e36f15" mode="Transparent" x="0" y="35" width="55" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="8109cd1c-5c2f-41f2-ab03-0f92e7e36f15" mode="Transparent" x="0" y="35" width="52" 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"/>
@@ -622,28 +622,28 @@
 	<columnHeader>
 		<band height="28" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="ab5f3970-f3bc-41b6-925a-2e805d11a697" x="0" y="19" width="42" height="9"/>
+				<reportElement uuid="ab5f3970-f3bc-41b6-925a-2e805d11a697" x="0" y="19" width="38" height="9"/>
 				<textElement textAlignment="Center">
 					<font size="5"/>
 				</textElement>
 				<text><![CDATA[Linha]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="140d1bb2-2a74-489a-955b-26898fda76fd" x="42" y="19" width="13" height="9"/>
+				<reportElement uuid="140d1bb2-2a74-489a-955b-26898fda76fd" x="38" y="19" width="14" height="9"/>
 				<textElement>
 					<font size="5"/>
 				</textElement>
 				<text><![CDATA[Lot.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="bcaa405e-87c5-44b3-91b0-473a9d5d232d" x="55" y="19" width="12" height="9"/>
+				<reportElement uuid="bcaa405e-87c5-44b3-91b0-473a9d5d232d" x="52" y="19" width="13" height="9"/>
 				<textElement>
 					<font size="5"/>
 				</textElement>
 				<text><![CDATA[Ser.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="db4d2cdf-6182-4ed4-88fb-793f2df5f819" x="101" y="19" width="20" height="9"/>
+				<reportElement uuid="db4d2cdf-6182-4ed4-88fb-793f2df5f819" x="99" y="19" width="22" height="9"/>
 				<textElement textAlignment="Center">
 					<font size="5"/>
 				</textElement>
@@ -871,7 +871,7 @@
 				<textFieldExpression><![CDATA[$P{DATA_MES_30}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="83819626-2df2-4c0d-a8a5-7aa76c2cf0be" x="777" y="10" width="21" height="9">
+				<reportElement uuid="83819626-2df2-4c0d-a8a5-7aa76c2cf0be" x="777" y="10" width="19" height="9">
 					<printWhenExpression><![CDATA[new GregorianCalendar($P{DATA_MES}.getYear(), $P{DATA_MES}.getMonth(), $P{DATA_MES}.getDate()).getActualMaximum(Calendar.DAY_OF_MONTH) > 30]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right">
@@ -1076,7 +1076,7 @@
 				<text><![CDATA[26]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="2bae6074-292b-43d3-9b6c-24ad69ddf4f6" x="798" y="19" width="17" height="9"/>
+				<reportElement uuid="2bae6074-292b-43d3-9b6c-24ad69ddf4f6" x="796" y="19" width="19" height="9"/>
 				<textElement textAlignment="Center">
 					<font size="5"/>
 				</textElement>
@@ -1101,7 +1101,7 @@
 				<textFieldExpression><![CDATA[$P{DATA_MES_30} != null ? "30" : ""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="f66dedbd-befa-42c1-bc68-b4a3875ab0cf" x="777" y="19" width="21" height="9">
+				<reportElement uuid="f66dedbd-befa-42c1-bc68-b4a3875ab0cf" x="777" y="19" width="19" height="9">
 					<printWhenExpression><![CDATA[new GregorianCalendar($P{DATA_MES}.getYear(), $P{DATA_MES}.getMonth(), $P{DATA_MES}.getDate()).getActualMaximum(Calendar.DAY_OF_MONTH) > 30]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right">
@@ -1117,7 +1117,7 @@
 				<text><![CDATA[Total]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="1044636e-4509-4245-be37-88cc4849b582" x="798" y="10" width="17" height="9"/>
+				<reportElement uuid="1044636e-4509-4245-be37-88cc4849b582" x="796" y="10" width="19" height="9"/>
 				<textElement textAlignment="Right">
 					<font size="5"/>
 				</textElement>
@@ -1131,7 +1131,7 @@
 				<text><![CDATA[]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a35e210c-d895-494f-9d94-886a1acc7850" x="67" y="19" width="34" height="9"/>
+				<reportElement uuid="a35e210c-d895-494f-9d94-886a1acc7850" x="65" y="19" width="34" height="9"/>
 				<textElement textAlignment="Center">
 					<font size="5"/>
 				</textElement>
@@ -1386,7 +1386,7 @@
 				<patternExpression><![CDATA[!$P{INDICADOR}.equals(6) ? "#,##0.00;-#,##0.00" : "###0"]]></patternExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="38d94d51-460f-4dfe-9b88-c627f3593b0c" x="777" y="0" width="21" height="23">
+				<reportElement uuid="38d94d51-460f-4dfe-9b88-c627f3593b0c" x="777" y="0" width="19" height="23">
 					<printWhenExpression><![CDATA[new GregorianCalendar($P{DATA_MES}.getYear(), $P{DATA_MES}.getMonth(), $P{DATA_MES}.getDate()).getActualMaximum(Calendar.DAY_OF_MONTH) > 30]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
@@ -1396,35 +1396,35 @@
 				<patternExpression><![CDATA[!$P{INDICADOR}.equals(6) ? "#,##0.00;-#,##0.00" : "###0"]]></patternExpression>
 			</textField>
 			<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="6cbe547b-fd61-4a67-a3c5-96e9b9742eb1" x="798" y="0" width="17" height="23"/>
+				<reportElement uuid="6cbe547b-fd61-4a67-a3c5-96e9b9742eb1" x="796" y="0" width="19" height="23"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{MEDIA}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="81f95e8c-5c85-43c5-b830-6ca9becc9619" x="0" y="0" width="42" height="23"/>
+				<reportElement uuid="81f95e8c-5c85-43c5-b830-6ca9becc9619" x="0" y="0" width="38" height="23"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{LINHA}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0" isBlankWhenNull="true">
-				<reportElement uuid="99bb4d23-7e3e-4384-b63d-d22765ba6e53" x="42" y="0" width="13" height="23"/>
+				<reportElement uuid="99bb4d23-7e3e-4384-b63d-d22765ba6e53" x="38" y="0" width="14" height="23"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{LOTACAO}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0" isBlankWhenNull="true">
-				<reportElement uuid="a4711633-73ff-4154-8b02-0b2e107cbbb4" x="55" y="0" width="12" height="23"/>
+				<reportElement uuid="a4711633-73ff-4154-8b02-0b2e107cbbb4" x="52" y="0" width="13" height="23"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{SERVICO}.substring(0,1)]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0" isBlankWhenNull="true">
-				<reportElement uuid="e77668a8-4828-4581-a0d6-6a8301d07573" x="101" y="0" width="20" height="23"/>
+				<reportElement uuid="e77668a8-4828-4581-a0d6-6a8301d07573" x="99" y="0" width="22" height="23"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="5"/>
 				</textElement>
@@ -1446,7 +1446,7 @@
 				<patternExpression><![CDATA[!$P{INDICADOR}.equals(6) ? "#,##0.00;-#,##0.00" : "###0"]]></patternExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="12f056a3-86a9-4877-ab72-155860f550f1" x="67" y="0" width="34" height="23"/>
+				<reportElement uuid="12f056a3-86a9-4877-ab72-155860f550f1" x="65" y="0" width="34" height="23"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="5"/>
 				</textElement>