From a90a73c41b288c2b35354cc6f43c232e183d81c2 Mon Sep 17 00:00:00 2001
From: "thiago.penido" <thiago.penido@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 29 Sep 2015 18:08:50 +0000
Subject: [PATCH] bug 6615

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@48401 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../templates/RelatorioDescontos.jasper       | Bin 48392 -> 48584 bytes
 .../templates/RelatorioDescontos.jrxml        |  16 ++++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontos.jasper
index e63707927705089026a725b02b1c765fba0294c2..6fc73e8cd544508cde01f89edaaccb4fc20027c8 100644
GIT binary patch
delta 4850
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
Hv77$}P^mx)

delta 5471
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
ZKfCKAuU!o}a=@G5hFv?y!jU(|{U5la8&UuO

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontos.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontos.jrxml
index c69fa4775..0e4d3797e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontos.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontos.jrxml
@@ -104,7 +104,7 @@
 					<textFieldExpression><![CDATA[$R{label.dataViagem}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="3a6335ef-979e-4232-ba62-f7113e8b6c89" x="232" y="12" width="63" height="10"/>
+					<reportElement uuid="3a6335ef-979e-4232-ba62-f7113e8b6c89" x="232" y="12" width="55" height="10"/>
 					<box>
 						<bottomPen lineWidth="0.5"/>
 					</box>
@@ -114,7 +114,7 @@
 					<textFieldExpression><![CDATA[$R{label.codServico}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="b3792e14-b26f-47a8-8da2-f35d3fc0f4fb" x="295" y="12" width="37" height="10"/>
+					<reportElement uuid="b3792e14-b26f-47a8-8da2-f35d3fc0f4fb" x="287" y="12" width="37" height="10"/>
 					<box>
 						<bottomPen lineWidth="0.5"/>
 					</box>
@@ -124,7 +124,7 @@
 					<textFieldExpression><![CDATA[$R{label.codOrigem}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="2122af46-a40b-476a-ac4c-dd9c0a5a3413" x="332" y="12" width="37" height="10"/>
+					<reportElement uuid="2122af46-a40b-476a-ac4c-dd9c0a5a3413" x="324" y="12" width="37" height="10"/>
 					<box>
 						<bottomPen lineWidth="0.5"/>
 					</box>
@@ -134,7 +134,7 @@
 					<textFieldExpression><![CDATA[$R{label.codDestino}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="ad5b6c97-a125-4e41-b08a-1c70642ae66e" x="369" y="12" width="45" height="10"/>
+					<reportElement uuid="ad5b6c97-a125-4e41-b08a-1c70642ae66e" x="361" y="12" width="53" height="10"/>
 					<box>
 						<bottomPen lineWidth="0.5"/>
 					</box>
@@ -379,28 +379,28 @@
 				<textFieldExpression><![CDATA[$F{dataViagem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="0b904fc9-5da8-42df-86e7-0749839574b6" x="232" y="0" width="63" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="0b904fc9-5da8-42df-86e7-0749839574b6" x="232" y="0" width="55" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{codServico}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="2dd64398-024e-4ce0-a8a8-2c93dec6182d" x="295" y="0" width="37" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="2dd64398-024e-4ce0-a8a8-2c93dec6182d" x="287" y="0" width="37" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{codOrigem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="b8655897-1818-4afc-be13-cf15abb85f41" x="332" y="0" width="37" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="b8655897-1818-4afc-be13-cf15abb85f41" x="324" y="0" width="37" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{codDestino}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="a2f90f64-e8eb-45b8-828b-53c01e7258a0" x="369" y="0" width="45" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="a2f90f64-e8eb-45b8-828b-53c01e7258a0" x="361" y="0" width="53" height="10" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>