From 2be601cd44a10a6ef7a2f8fdf7f0cf7ec3853708 Mon Sep 17 00:00:00 2001
From: "eduardo.dicarde" <eduardo.dicarde@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 27 Aug 2015 18:59:43 +0000
Subject: [PATCH] fixed bug #6546

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@47288 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../templates/RelatorioOrigemDestino.jasper   | Bin 75535 -> 75533 bytes
 .../templates/RelatorioOrigemDestino.jrxml    |  70 +++++++++---------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper
index 328d7f3dd9ac9dcb32c9f3093a77ff1968c788f9..cf90d49e068d9a7b78f1e401f4a9203d267576fb 100644
GIT binary patch
delta 679
zcmeA_$I^R_Wy1yg$!{&WHs7)jWCSr-4H+01tS28d)!dxyr~(nv0SZk83+;DO@)j0l
zU<3+)fE5sf*!q(N*Q!pI?E8Qu2Q~*T=h**o@-rhLMu^I+2_Gis&*0(&8w^)7Y2p_o
z{eD2BJ>hcuCVfYea{$Ushs(X4{0&LY5h!;ZCbwC7Dkmev(#>AexM9rd>1;6O@);~J
z=Ea#zj4c0w0PLGTv))hsw}y+;h=GC07bdz{c@9vyC`iF(-?<hr=IVLoFeb->-Hel6
zCa6t*xiFZ~1#D8%q5y=kw-<e!th1Dh^B~ZPAOJCoWr-EcfRv@pFedME2S%_POo48Y
zfVp9E>xz$H(K?`LJzR9%%1=n4;0rVwWCbL=Z>;)>Bxel_AwHPgX3jM%5MOT=Tr14T
z=(<^T-5wShMuS3zIyRjW1|b7IO9LcmXlS_k|E4^CMv={Vhq##-MK@O+k>(LLH!w6X
zFtRYTh_^5_GBh(_XJDM%_g!sr{42iAcP@BI;!?0V{#CXOhGYqY(PTq*ndv{(7{vfh
CQqErh

delta 689
zcmeA@$I^d}Wy1yg$-PZnn{U|%GEQDl$};(UIvb}U0|SFK5Hn7)Qr(>Fr~;Q^)dq@A
zoqW(#bMt;DCGW}q)^IUePu{aocd}&P2M~`Htab8%g_@Hc`#(;$%jRTb&;;tq0SjeK
z_y7^o0UHBSHEH4(VKD|qARh$$fOdKUX`RV}YgH%joAez?&H*Sl9WM8F@;4+oN1)tw
znA~RRsho_Ax*#JqdrjkpF{`Ju!I;Zuu)vrXXEHIe0Ch5eZTvIqJ;;Gv3`PtLOujJT
z&B}9t>V?4u`p&h0F;~wsXJixsi*hX3&BzFG^vi|8jE-Q#k`@IZOuoJ7qp&pGp9euk
z0|CTLmL*m&gHo0@!<f9w9T*{wF$FqC0;C*lZ0ibexN<Sn0fp<~!s}LkLJAO&+d-B<
z+;n5rPb4{D%rf%9<Ti7zVSxm|X2G?>jEqj3RoCrdkz+PAF)3uIW78>N5Hi#=Ha0Xs
z03)-_e>dgvPxe~KwYl^V6BDDz=87ZIJYr^sMn;zAh9+k5hGxbVW+v<mjEq1Be7vkY
lIrbIb=35uMB=M-(9Q!KUMi||U5(cBmhU_xazpF8d0RTDPy;T4J

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml
index eed7dae37..eff91ecad 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.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="RelatorioOrigemDestino" pageWidth="792" pageHeight="842" columnWidth="765" leftMargin="20" rightMargin="7" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4">
-	<property name="ireport.zoom" value="1.3310000000000026"/>
+	<property name="ireport.zoom" value="0.9090909090909111"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="144"/>
+	<property name="ireport.y" value="0"/>
 	<subDataset name="peso_operacional" uuid="6107709b-669e-4e25-b14f-19ae373fd33c">
 		<parameter name="corrida_id_relatorio" class="java.math.BigDecimal"/>
 		<queryString>
@@ -99,110 +99,110 @@
 	<group name="group_corrida_id">
 		<groupExpression><![CDATA[$F{CORRIDA_1}]]></groupExpression>
 		<groupHeader>
-			<band height="66">
+			<band height="69">
 				<staticText>
-					<reportElement uuid="781a710f-41c2-44a8-aeef-e6a41eaea789" x="0" y="46" width="59" height="19"/>
+					<reportElement uuid="781a710f-41c2-44a8-aeef-e6a41eaea789" x="1" y="47" width="58" height="21"/>
 					<textElement verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Origem]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="b19dd283-526d-42b2-8692-1d0c56eda657" x="59" y="46" width="49" height="19"/>
+					<reportElement uuid="b19dd283-526d-42b2-8692-1d0c56eda657" x="59" y="47" width="49" height="21"/>
 					<textElement verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Destino]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="b26182c0-96bd-4b51-82d3-c589579af47a" x="108" y="46" width="41" height="20"/>
+					<reportElement uuid="b26182c0-96bd-4b51-82d3-c589579af47a" x="108" y="47" width="41" height="21"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[KM]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="fe8b55b0-c7a9-4e29-bc91-080042193b20" x="149" y="46" width="44" height="20"/>
+					<reportElement uuid="fe8b55b0-c7a9-4e29-bc91-080042193b20" x="149" y="47" width="44" height="21"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Tarifa]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="9b8e97b5-9895-4865-bc1c-f9541e80a054" x="329" y="44" width="78" height="22"/>
+					<reportElement uuid="9b8e97b5-9895-4865-bc1c-f9541e80a054" x="329" y="47" width="78" height="21"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Absolutos]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="3cb1abe8-5eb1-4260-8337-1276ba50ec6e" x="407" y="44" width="64" height="22"/>
+					<reportElement uuid="3cb1abe8-5eb1-4260-8337-1276ba50ec6e" x="407" y="47" width="64" height="21"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Receitas]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="8a06a97e-99ba-450a-b773-fe8c72da4aa3" x="471" y="44" width="65" height="22"/>
+					<reportElement uuid="8a06a97e-99ba-450a-b773-fe8c72da4aa3" x="471" y="47" width="65" height="21"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Rec./Abs.]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="a7139fb0-1036-4b6c-a3b7-49d277aa02c1" x="536" y="45" width="74" height="21"/>
+					<reportElement uuid="a7139fb0-1036-4b6c-a3b7-49d277aa02c1" x="536" y="47" width="74" height="21"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Equivalente]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="89706cbe-b0fb-458b-843c-fcfad356e1da" x="610" y="45" width="52" height="21"/>
+					<reportElement uuid="89706cbe-b0fb-458b-843c-fcfad356e1da" x="610" y="47" width="52" height="21"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Pax*KM]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="0fdf3c83-7477-4770-804d-c856d929700c" x="662" y="45" width="51" height="21"/>
+					<reportElement uuid="0fdf3c83-7477-4770-804d-c856d929700c" x="662" y="47" width="51" height="21"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[%Abs]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="3ac11ce6-e68d-4a22-b398-12ae861e97c2" x="713" y="45" width="52" height="21"/>
+					<reportElement uuid="3ac11ce6-e68d-4a22-b398-12ae861e97c2" x="713" y="47" width="52" height="21"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[%Equi]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="c0095aaf-98df-4c84-a162-73e7f5fd2fa2" x="271" y="0" width="265" height="19"/>
+					<reportElement uuid="c0095aaf-98df-4c84-a162-73e7f5fd2fa2" x="271" y="-1" width="265" height="19"/>
 					<textElement verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Linha]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="c2ca7785-7d17-4ed3-aba1-6dc0324c27ab" x="589" y="0" width="50" height="20"/>
+					<reportElement uuid="c2ca7785-7d17-4ed3-aba1-6dc0324c27ab" x="589" y="-1" width="50" height="19"/>
 					<textElement verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Horário]]></text>
 				</staticText>
 				<textField>
-					<reportElement uuid="523ac3ad-3918-41f8-9a59-a89ae6bbc9ca" x="193" y="19" width="77" height="25"/>
+					<reportElement uuid="523ac3ad-3918-41f8-9a59-a89ae6bbc9ca" x="193" y="21" width="77" height="25"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$F{CORRIDA_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="d4373b5b-172d-44fb-b2aa-5ab7cb02137e" x="270" y="19" width="266" height="25"/>
+					<reportElement uuid="d4373b5b-172d-44fb-b2aa-5ab7cb02137e" x="270" y="21" width="266" height="25"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$F{DESCRUTA}]]></textFieldExpression>
 				</textField>
 				<textField pattern="HH:mm">
-					<reportElement uuid="933f2533-0f1e-4359-a70b-71f39018068d" x="589" y="20" width="50" height="25"/>
+					<reportElement uuid="933f2533-0f1e-4359-a70b-71f39018068d" x="589" y="21" width="50" height="25"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$F{FECHORSALIDA}]]></textFieldExpression>
 				</textField>
@@ -210,63 +210,63 @@
 					<reportElement uuid="840b06de-e082-4cbb-9eb3-f684933a17fb" x="0" y="19" width="763" height="1"/>
 				</line>
 				<line>
-					<reportElement uuid="e43ff8fc-e645-4e03-a46c-b9259e03eead" x="0" y="44" width="763" height="1"/>
+					<reportElement uuid="e43ff8fc-e645-4e03-a46c-b9259e03eead" x="0" y="46" width="763" height="1"/>
 				</line>
 				<line>
-					<reportElement uuid="aa242ed1-f522-4932-ab75-b459a8e1aa9a" x="0" y="65" width="763" height="1"/>
+					<reportElement uuid="aa242ed1-f522-4932-ab75-b459a8e1aa9a" x="0" y="68" width="763" height="1"/>
 				</line>
 				<staticText>
-					<reportElement uuid="21260120-2ec7-4efe-bb44-fbfcd1c0e38c" x="0" y="0" width="192" height="19"/>
+					<reportElement uuid="21260120-2ec7-4efe-bb44-fbfcd1c0e38c" x="0" y="-1" width="192" height="19"/>
 					<textElement verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Empresa]]></text>
 				</staticText>
 				<textField>
-					<reportElement uuid="ac63342f-d2bb-4fb8-8f3f-6d1a621c92f0" x="0" y="19" width="193" height="27"/>
+					<reportElement uuid="ac63342f-d2bb-4fb8-8f3f-6d1a621c92f0" x="0" y="21" width="193" height="25"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$F{NOMBEMPRESA}]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement uuid="a24cf606-d6da-4c49-bbc6-1f4df6d625c9" x="536" y="20" width="53" height="25"/>
+					<reportElement uuid="a24cf606-d6da-4c49-bbc6-1f4df6d625c9" x="536" y="21" width="53" height="25"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$F{INDSENTIDOIDA}==1?"Ida":$F{INDSENTIDOIDA}==0?"Volta":""]]></textFieldExpression>
 				</textField>
 				<textField evaluationTime="Group" evaluationGroup="group_corrida_id" pattern="#,##0.00">
-					<reportElement uuid="6b5e70f2-4dea-4f8e-a912-f06af74d8053" x="639" y="20" width="126" height="25"/>
+					<reportElement uuid="6b5e70f2-4dea-4f8e-a912-f06af74d8053" x="639" y="21" width="126" height="25"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$V{PRECIOBASE_1}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement uuid="7e4b01fa-7ae7-4e9d-b67e-e215a7cd847f" x="536" y="0" width="53" height="20"/>
+					<reportElement uuid="7e4b01fa-7ae7-4e9d-b67e-e215a7cd847f" x="536" y="-1" width="53" height="19"/>
 					<textElement verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Sentido]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="b73636f9-9b1b-4538-9364-6abf618779da" x="639" y="0" width="126" height="20"/>
+					<reportElement uuid="b73636f9-9b1b-4538-9364-6abf618779da" x="639" y="-1" width="126" height="19"/>
 					<textElement verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Tar.Max.]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="c3b59366-d5f6-4922-a151-a6b26108760b" x="193" y="44" width="77" height="22"/>
+					<reportElement uuid="c3b59366-d5f6-4922-a151-a6b26108760b" x="193" y="47" width="77" height="21"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Tx Embarque]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="87db336a-d9ef-4afd-9930-3791c35cc842" x="270" y="44" width="59" height="22"/>
+					<reportElement uuid="87db336a-d9ef-4afd-9930-3791c35cc842" x="270" y="47" width="59" height="21"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Pedagio]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="3e50d8ca-1a89-47d9-b0f6-dea5d1246e10" x="192" y="0" width="79" height="19"/>
+					<reportElement uuid="3e50d8ca-1a89-47d9-b0f6-dea5d1246e10" x="192" y="-1" width="79" height="19"/>
 					<textElement verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
@@ -614,9 +614,9 @@
 		</band>
 	</title>
 	<pageHeader>
-		<band height="20" splitType="Stretch">
+		<band height="21" splitType="Stretch">
 			<line>
-				<reportElement uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa" x="0" y="19" width="763" height="1"/>
+				<reportElement uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa" x="0" y="20" width="763" height="1"/>
 			</line>
 			<textField>
 				<reportElement uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec" x="0" y="0" width="765" height="20"/>
@@ -683,17 +683,17 @@
 				<textFieldExpression><![CDATA[$V{equivalente}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b3bae3e1-ad19-4ed0-8188-b4700f493c28" x="1" y="0" width="58" height="20"/>
+				<reportElement uuid="b3bae3e1-ad19-4ed0-8188-b4700f493c28" x="1" y="0" width="58" height="21"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{ORIGEM}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="e3a13390-06e7-4bda-bb55-8afbfb15d6fb" x="59" y="1" width="49" height="20"/>
+				<reportElement uuid="e3a13390-06e7-4bda-bb55-8afbfb15d6fb" x="59" y="0" width="49" height="21"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{DESTINO}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="9fef3b4f-3c79-4b11-8702-0f4c5757b81e" x="149" y="0" width="43" height="20"/>
+				<reportElement uuid="9fef3b4f-3c79-4b11-8702-0f4c5757b81e" x="149" y="0" width="44" height="21"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{PRECIOBASE}]]></textFieldExpression>
 			</textField>