From 9a6bf89a1b3b1c3ed4745a24f8e7f5830c60da0d Mon Sep 17 00:00:00 2001
From: vinicio <vinicio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 1 Jun 2016 13:14:30 +0000
Subject: [PATCH] fixes bug #0007446

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@56567 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../RelatorioEmpresaCorrida_es.properties     |   8 +-
 .../RelatorioEmpresaCorrida_pt_BR.properties  |   9 +-
 .../templates/RelatorioEmpresaCorrida.jasper  | Bin 37371 -> 37481 bytes
 .../templates/RelatorioEmpresaCorrida.jrxml   | 216 ++++++++++--------
 .../templates/RelatorioEmpresaOnibus.jasper   | Bin 36049 -> 35464 bytes
 .../templates/RelatorioEmpresaOnibus.jrxml    |  87 ++++---
 6 files changed, 165 insertions(+), 155 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_es.properties
index 5cc45a75a..d893eb94b 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_es.properties
@@ -10,16 +10,16 @@ header.filtro=Filtro\:
 header.filtro.servico=Servicio\: 
 header.filtro.linha=Línea\: 
 header.filtro.grupo=Grupo de líneas\:
-
+header.km.grupo=Total recorrido en Km
 #Labels detail
 
 detail.linea=Línea origen - destino
 detail.boletos=Recaudaciones Boletos ($)
 detail.abonos=Recaudaciones abonos ($)
-detail.kmOnibusProprio=Total Km ómnibus propios
-detail.kmOnibusArrendados=Total Km ómnibus arrendados (km)
-detail.kmTotal=Distancia recorrida total (km)
 detail.pasajerosTransportados=Pasajeros transportados
+detail.kmOnibusProprio=Ómnibus propios
+detail.kmOnibusArrendados=Ómnibus arrendados
+detail.kmTotal=Distancia total
 
 linhas=Líneas
 
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_pt_BR.properties
index eb82581da..b77ac1def 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_pt_BR.properties
@@ -10,16 +10,17 @@ header.filtro=Filtro\:
 header.filtro.servico=Serviço\: 
 header.filtro.linha=Linhas\: 
 header.filtro.grupo=Grupo de linhas\:
-
+header.km.grupo=Total percorrido em Km
 #Labels detail
 
 detail.linea=Linha origem - destino
 detail.boletos=Boletos ($)
 detail.abonos=Abonos ($)
-detail.kmOnibusProprio=Total Km ônibus próprio
-detail.kmOnibusArrendados=Total Km ônibus arrendados
-detail.kmTotal=Distância recorrida total (km)
 detail.pasajerosTransportados=Passageiros transportados
+detail.kmOnibusProprio=Ônibus próprio
+detail.kmOnibusArrendados=Ônibus arrendados
+detail.kmTotal=Distância total
+
 
 linhas=Linhas
 
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jasper
index 595940846f01febf19da64e1be784992ea1f87d7..bcacc3deab75321629bc4175e4073556daa9f6fb 100644
GIT binary patch
delta 9983
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

delta 9928
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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml
index 8875c4a85..177433b9f 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml
@@ -1,8 +1,10 @@
 <?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="RelatorioEmpresaCorrida" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
-	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="48"/>
+	<property name="ireport.zoom" value="2.4157650000000355"/>
+	<property name="ireport.x" value="645"/>
+	<property name="ireport.y" value="0"/>
+	<property name="net.sf.jasperreports.export.xls.remove.emtpy.space.between.columns" value="true"/>
+	<property name="net.sf.jasperreports.export.xls.remove.emtpy.space.between.rows" value="true"/>
 	<parameter name="fecInicio" class="java.lang.String">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
 	</parameter>
@@ -44,76 +46,84 @@
 	<group name="empresa">
 		<groupExpression><![CDATA[$F{empresa}]]></groupExpression>
 		<groupHeader>
-			<band height="69">
+			<band height="43">
 				<textField>
-					<reportElement uuid="09306494-79f1-44dd-9eed-c39684384bbf" x="0" y="0" width="231" height="20"/>
+					<reportElement uuid="09306494-79f1-44dd-9eed-c39684384bbf" x="0" y="0" width="326" height="20"/>
 					<textElement>
 						<font size="12" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="e8355048-a037-4837-866b-e6cf7a3e90ed" x="215" y="20" width="67" height="47"/>
-					<textElement textAlignment="Center" markup="none">
-						<font size="10"/>
+					<reportElement uuid="e8355048-a037-4837-866b-e6cf7a3e90ed" x="192" y="20" width="59" height="22"/>
+					<textElement markup="none">
+						<font size="9"/>
+						<paragraph firstLineIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.abonos}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="edd89ef1-92d6-4b5f-b249-851532fad9df" x="415" y="21" width="62" height="48"/>
-					<textElement textAlignment="Justified" markup="none">
-						<font size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.kmTotal}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="73c02335-4bbe-44ba-9c73-1201ed6b3967" x="487" y="21" width="68" height="48"/>
-					<textElement textAlignment="Justified" markup="none">
-						<font size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$R{detail.pasajerosTransportados}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="d88253ec-b6d4-4e99-b677-3c1a0b273a81" x="137" y="21" width="67" height="48"/>
-					<textElement textAlignment="Center" markup="none">
-						<font size="10"/>
+					<reportElement uuid="d88253ec-b6d4-4e99-b677-3c1a0b273a81" x="132" y="20" width="60" height="22"/>
+					<textElement markup="none">
+						<font size="9"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.boletos}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="569add1e-cb73-4278-b800-fa44631527f6" x="350" y="20" width="52" height="48"/>
-					<textElement textAlignment="Justified" markup="none">
-						<font size="10"/>
+					<reportElement uuid="569add1e-cb73-4278-b800-fa44631527f6" x="399" y="20" width="88" height="22"/>
+					<textElement markup="none">
+						<font size="9"/>
+						<paragraph firstLineIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.kmOnibusArrendados}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="31387dbf-1cdc-4c27-992f-2e439abea576" x="292" y="20" width="48" height="48"/>
-					<textElement textAlignment="Justified" markup="none">
-						<font size="10"/>
+					<reportElement uuid="31387dbf-1cdc-4c27-992f-2e439abea576" x="326" y="20" width="73" height="22"/>
+					<textElement markup="none">
+						<font size="9"/>
+						<paragraph leftIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.kmOnibusProprio}]]></textFieldExpression>
 				</textField>
-				<line>
-					<reportElement uuid="76104c33-e003-4a38-98bb-9db4d0f8636b" x="0" y="20" width="555" height="1"/>
-				</line>
-				<line>
-					<reportElement uuid="97639de4-d619-4f05-9b3e-e615b643b778" x="0" y="68" width="555" height="1"/>
-				</line>
 				<textField>
-					<reportElement uuid="12ef050d-3938-4dd6-8e82-bfeca7adaa2a" x="0" y="21" width="137" height="48"/>
+					<reportElement uuid="12ef050d-3938-4dd6-8e82-bfeca7adaa2a" x="0" y="20" width="132" height="22"/>
 					<textElement markup="none">
-						<font size="10"/>
+						<font size="9"/>
+						<paragraph leftIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.linea}]]></textFieldExpression>
 				</textField>
+				<textField>
+					<reportElement uuid="fb4fcf1b-de90-426b-bfaa-732a08711977" x="326" y="0" width="229" height="20"/>
+					<textElement verticalAlignment="Bottom">
+						<font isBold="true"/>
+						<paragraph leftIndent="2"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{header.km.grupo}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement uuid="73c02335-4bbe-44ba-9c73-1201ed6b3967" x="251" y="20" width="75" height="22"/>
+					<textElement markup="none">
+						<font size="9"/>
+						<paragraph firstLineIndent="2"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{detail.pasajerosTransportados}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement uuid="edd89ef1-92d6-4b5f-b249-851532fad9df" x="487" y="20" width="68" height="22"/>
+					<textElement markup="none">
+						<font size="9"/>
+						<paragraph firstLineIndent="2"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$R{detail.kmTotal}]]></textFieldExpression>
+				</textField>
 			</band>
 		</groupHeader>
 		<groupFooter>
-			<band height="48">
+			<band height="23">
 				<textField pattern="#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="96095298-1c13-4089-8a8b-fd324b377e45" x="137" y="3" width="67" height="16"/>
-					<textElement textAlignment="Right">
+					<reportElement uuid="96095298-1c13-4089-8a8b-fd324b377e45" x="131" y="3" width="55" height="16"/>
+					<textElement textAlignment="Center">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.boletos}]]></textFieldExpression>
@@ -122,28 +132,28 @@
 					<reportElement uuid="6cef9de7-7dee-488b-aea7-3d02a8e3634a" x="0" y="0" width="555" height="1"/>
 				</line>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="354a3daa-dbb6-45c0-93c3-b9c4f485cbb5" x="215" y="3" width="67" height="16"/>
-					<textElement textAlignment="Right"/>
+					<reportElement uuid="354a3daa-dbb6-45c0-93c3-b9c4f485cbb5" x="186" y="3" width="53" height="16"/>
+					<textElement textAlignment="Center"/>
 					<textFieldExpression><![CDATA[$V{sum.abonos}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="2f518abc-f4b9-411b-bb4f-5e58c0a2b301" x="292" y="3" width="48" height="16"/>
-					<textElement textAlignment="Right"/>
+					<reportElement uuid="2f518abc-f4b9-411b-bb4f-5e58c0a2b301" x="327" y="3" width="72" height="16"/>
+					<textElement textAlignment="Center"/>
 					<textFieldExpression><![CDATA[$V{sum.kmOnibusProprio}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="6ce0a6db-3435-4ef2-be61-273af168410f" x="350" y="2" width="52" height="16"/>
-					<textElement textAlignment="Right"/>
+					<reportElement uuid="6ce0a6db-3435-4ef2-be61-273af168410f" x="399" y="3" width="89" height="16"/>
+					<textElement textAlignment="Center"/>
 					<textFieldExpression><![CDATA[$V{sum.kmOnibusArrendados}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="3abc13c1-b7df-49e7-977a-c49638f639c2" x="415" y="3" width="62" height="16"/>
-					<textElement textAlignment="Right"/>
+					<reportElement uuid="3abc13c1-b7df-49e7-977a-c49638f639c2" x="488" y="3" width="67" height="16"/>
+					<textElement textAlignment="Center"/>
 					<textFieldExpression><![CDATA[$V{sum.kmTotal}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="9a3560b6-4371-4d7c-9336-f7578ccadda8" x="487" y="3" width="68" height="16"/>
-					<textElement textAlignment="Right"/>
+					<reportElement uuid="9a3560b6-4371-4d7c-9336-f7578ccadda8" x="239" y="3" width="88" height="16"/>
+					<textElement textAlignment="Center"/>
 					<textFieldExpression><![CDATA[$V{sum.pasajerosTransportados}]]></textFieldExpression>
 				</textField>
 			</band>
@@ -153,46 +163,45 @@
 		<band splitType="Stretch"/>
 	</background>
 	<pageHeader>
-		<band height="60" splitType="Stretch">
+		<band height="39" splitType="Stretch">
 			<textField>
-				<reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="0" y="20" width="49" height="20"/>
+				<reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="0" y="19" width="49" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.periodo}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60" x="401" y="0" width="56" height="20"/>
+				<reportElement uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60" x="399" y="0" width="58" height="19"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
 			</textField>
-			<textField evaluationTime="Report">
-				<reportElement uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f" x="533" y="20" width="22" height="20"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
+			<textField>
+				<reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="444" y="19" width="82" height="20"/>
+				<textElement textAlignment="Right">
+					<paragraph rightIndent="2"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{header.pagina}+" "+$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="467" y="20" width="42" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50" x="49" y="20" width="182" height="20"/>
+				<reportElement uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50" x="49" y="19" width="395" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$P{fecInicio} + " à " + $P{fecFinal}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="652312bd-292a-424d-a234-5f157e3699c6" x="0" y="0" width="231" height="20"/>
-				<textElement/>
+				<reportElement uuid="652312bd-292a-424d-a234-5f157e3699c6" x="0" y="0" width="399" height="19"/>
+				<textElement>
+					<font size="12" isBold="true"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm">
-				<reportElement uuid="6f671365-868e-41a6-81ee-a308d1d91e1d" x="457" y="0" width="98" height="20"/>
+				<reportElement uuid="6f671365-868e-41a6-81ee-a308d1d91e1d" x="457" y="0" width="98" height="19"/>
 				<textElement textAlignment="Left"/>
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a" x="509" y="20" width="24" height="20"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
+			<textField evaluationTime="Report">
+				<reportElement uuid="0228244f-d8b1-47c5-9020-513456ec745c" x="526" y="19" width="29" height="20"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageHeader>
@@ -200,62 +209,69 @@
 		<band splitType="Stretch"/>
 	</columnHeader>
 	<detail>
-		<band height="35" splitType="Stretch">
+		<band height="19" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" x="415" y="1" width="62" height="34"/>
-				<textElement textAlignment="Right">
-					<font size="10"/>
+				<reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" x="487" y="0" width="68" height="17"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{kmTotal}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568" x="215" y="0" width="67" height="34"/>
-				<textElement textAlignment="Right">
-					<font size="10"/>
+				<reportElement uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568" x="192" y="0" width="59" height="17"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{abonos}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="4a68f71a-7be1-467a-b3eb-641a0c1f9a48" x="487" y="1" width="68" height="34"/>
-				<textElement textAlignment="Right">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{pasajerosTransportados}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f" x="350" y="0" width="52" height="34"/>
-				<textElement textAlignment="Right">
-					<font size="10"/>
+				<reportElement uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f" x="399" y="0" width="88" height="17"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{kmOnibusArrendados}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="9f731da4-307a-4409-a8d5-28b2c4c40fce" x="0" y="1" width="137" height="34"/>
+				<reportElement uuid="9f731da4-307a-4409-a8d5-28b2c4c40fce" x="0" y="0" width="132" height="17"/>
 				<textElement textAlignment="Left">
-					<font size="10"/>
+					<font size="9"/>
+					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{linea}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="c29b2244-5b3e-48a2-9adf-8e10ee2a3856" x="326" y="0" width="73" height="17"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph leftIndent="2"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{kmOnibusProprio}]]></textFieldExpression>
+			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="false">
-				<reportElement uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529" x="137" y="1" width="67" height="34"/>
-				<textElement textAlignment="Right">
-					<font size="10"/>
+				<reportElement uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529" x="132" y="0" width="60" height="17"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{boletos}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="c29b2244-5b3e-48a2-9adf-8e10ee2a3856" x="292" y="0" width="48" height="34"/>
-				<textElement textAlignment="Right">
-					<font size="10"/>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="4a68f71a-7be1-467a-b3eb-641a0c1f9a48" x="251" y="0" width="75" height="17"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph leftIndent="2"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{kmOnibusProprio}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{pasajerosTransportados}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
 	<noData>
 		<band height="20">
 			<textField>
-				<reportElement uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620" x="0" y="0" width="803" height="20"/>
+				<reportElement uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620" x="0" y="0" width="555" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
 			</textField>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaOnibus.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaOnibus.jasper
index b5eb564a193a157fe933b679c636a0b37d1aa4fc..19357bf92cbb0140e10f96b22437c480b1796225 100644
GIT binary patch
delta 9157
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

delta 9514
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
AE&u=k

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaOnibus.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaOnibus.jrxml
index bec6d26ff..b4590786b 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaOnibus.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaOnibus.jrxml
@@ -1,7 +1,7 @@
 <?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="RelatorioEmpresaCorrida" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
-	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="149"/>
+	<property name="ireport.zoom" value="2.4157650000000044"/>
+	<property name="ireport.x" value="927"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="fecInicio" class="java.lang.String">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
@@ -35,64 +35,58 @@
 	<group name="empresa">
 		<groupExpression><![CDATA[$F{empresa}]]></groupExpression>
 		<groupHeader>
-			<band height="69">
+			<band height="36">
 				<textField>
-					<reportElement uuid="09306494-79f1-44dd-9eed-c39684384bbf" x="0" y="33" width="231" height="20"/>
+					<reportElement uuid="09306494-79f1-44dd-9eed-c39684384bbf" x="0" y="0" width="555" height="20"/>
 					<textElement>
 						<font size="12" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="e8355048-a037-4837-866b-e6cf7a3e90ed" x="122" y="53" width="56" height="15"/>
+					<reportElement uuid="e8355048-a037-4837-866b-e6cf7a3e90ed" x="122" y="20" width="56" height="15"/>
 					<textElement markup="none">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.coche}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="edd89ef1-92d6-4b5f-b249-851532fad9df" x="373" y="53" width="37" height="15"/>
+					<reportElement uuid="edd89ef1-92d6-4b5f-b249-851532fad9df" x="373" y="20" width="37" height="15"/>
 					<textElement markup="none">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="73c02335-4bbe-44ba-9c73-1201ed6b3967" x="410" y="53" width="47" height="15"/>
+					<reportElement uuid="73c02335-4bbe-44ba-9c73-1201ed6b3967" x="410" y="20" width="47" height="15"/>
 					<textElement markup="none">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.kmts}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="d88253ec-b6d4-4e99-b677-3c1a0b273a81" x="61" y="53" width="61" height="15"/>
+					<reportElement uuid="d88253ec-b6d4-4e99-b677-3c1a0b273a81" x="61" y="20" width="61" height="15"/>
 					<textElement markup="none">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.dia}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="569add1e-cb73-4278-b800-fa44631527f6" x="274" y="53" width="99" height="15"/>
+					<reportElement uuid="569add1e-cb73-4278-b800-fa44631527f6" x="274" y="20" width="99" height="15"/>
 					<textElement markup="none">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="31387dbf-1cdc-4c27-992f-2e439abea576" x="178" y="53" width="96" height="15"/>
+					<reportElement uuid="31387dbf-1cdc-4c27-992f-2e439abea576" x="178" y="20" width="96" height="15"/>
 					<textElement markup="none">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.origen}]]></textFieldExpression>
 				</textField>
-				<line>
-					<reportElement uuid="76104c33-e003-4a38-98bb-9db4d0f8636b" x="0" y="53" width="555" height="1"/>
-				</line>
-				<line>
-					<reportElement uuid="97639de4-d619-4f05-9b3e-e615b643b778" x="0" y="68" width="555" height="1"/>
-				</line>
 				<textField>
-					<reportElement uuid="12ef050d-3938-4dd6-8e82-bfeca7adaa2a" x="0" y="54" width="61" height="15"/>
+					<reportElement uuid="12ef050d-3938-4dd6-8e82-bfeca7adaa2a" x="0" y="20" width="61" height="15"/>
 					<textElement markup="none">
 						<font size="10"/>
 					</textElement>
@@ -103,14 +97,14 @@
 		<groupFooter>
 			<band height="19">
 				<textField isBlankWhenNull="true">
-					<reportElement uuid="96095298-1c13-4089-8a8b-fd324b377e45" x="410" y="0" width="57" height="16"/>
+					<reportElement uuid="96095298-1c13-4089-8a8b-fd324b377e45" x="410" y="1" width="57" height="16"/>
 					<textElement textAlignment="Left">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.kmts}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement uuid="1b8e90f1-09d3-4419-8d8b-a917b3b1f414" x="373" y="0" width="37" height="16"/>
+					<reportElement uuid="1b8e90f1-09d3-4419-8d8b-a917b3b1f414" x="373" y="1" width="37" height="16"/>
 					<textElement/>
 					<text><![CDATA[Total]]></text>
 				</staticText>
@@ -147,7 +141,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<pageHeader>
-		<band height="60" splitType="Stretch">
+		<band height="41" splitType="Stretch">
 			<textField>
 				<reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="0" y="20" width="49" height="20"/>
 				<textElement/>
@@ -158,24 +152,18 @@
 				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
 			</textField>
-			<textField evaluationTime="Report">
-				<reportElement uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f" x="533" y="20" width="22" height="20"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
+			<textField>
+				<reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="446" y="20" width="77" height="20"/>
+				<textElement textAlignment="Right">
+					<paragraph rightIndent="2"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{header.pagina}+" "+$V{PAGE_NUMBER}+" de "]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="467" y="20" width="42" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50" x="49" y="20" width="182" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$P{fecInicio} + " à " + $P{fecFinal}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="652312bd-292a-424d-a234-5f157e3699c6" x="0" y="0" width="231" height="20"/>
-				<textElement/>
+				<reportElement uuid="652312bd-292a-424d-a234-5f157e3699c6" x="0" y="0" width="401" height="20"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm">
@@ -184,9 +172,14 @@
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a" x="509" y="20" width="24" height="20"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
+				<reportElement uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50" x="39" y="20" width="407" height="20"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$P{fecInicio} + " à " + $P{fecFinal}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement uuid="48be49ee-ffce-4682-9665-36b6dfc42aa1" x="523" y="20" width="32" height="20"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageHeader>
@@ -198,49 +191,49 @@
 			<textField>
 				<reportElement uuid="c29b2244-5b3e-48a2-9adf-8e10ee2a3856" x="178" y="0" width="96" height="16"/>
 				<textElement textAlignment="Left">
-					<font size="10"/>
+					<font size="9"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" x="373" y="0" width="37" height="16"/>
 				<textElement textAlignment="Left">
-					<font size="10"/>
+					<font size="9"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{hora}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568" x="122" y="0" width="56" height="16"/>
 				<textElement textAlignment="Left">
-					<font size="10"/>
+					<font size="9"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{coche}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
 				<reportElement uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529" x="61" y="0" width="61" height="16"/>
 				<textElement textAlignment="Left">
-					<font size="10"/>
+					<font size="9"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{dia}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="4a68f71a-7be1-467a-b3eb-641a0c1f9a48" x="410" y="0" width="47" height="16"/>
 				<textElement textAlignment="Left">
-					<font size="10"/>
+					<font size="9"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{kmts}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f" x="274" y="0" width="99" height="16"/>
 				<textElement textAlignment="Left">
-					<font size="10"/>
+					<font size="9"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="9f731da4-307a-4409-a8d5-28b2c4c40fce" x="0" y="1" width="61" height="16"/>
+				<reportElement uuid="9f731da4-307a-4409-a8d5-28b2c4c40fce" x="0" y="0" width="61" height="16"/>
 				<textElement textAlignment="Left">
-					<font size="10"/>
+					<font size="9"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{corridaId}]]></textFieldExpression>
 			</textField>