From 651dab9b7c7658bb7433e60578d2561b533a2775 Mon Sep 17 00:00:00 2001
From: valdevir <valdevir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 19 May 2021 02:30:41 +0000
Subject: [PATCH] fixes bug#22261 qua: dev:Valdevir

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@106766 d1611594-4594-4d17-8e1d-87c2c4800839
---
 ...atorioResumoLinhasAnaliticoSumarizado.java |  23 +-
 .../RelatorioResumoLinhasAnalitico.jasper     | Bin 119505 -> 119438 bytes
 .../RelatorioResumoLinhasAnalitico.jrxml      |  88 +++----
 ...nhasAnaliticoSimplificadoSumarizado.jasper | Bin 74075 -> 74072 bytes
 ...inhasAnaliticoSimplificadoSumarizado.jrxml |  90 ++++----
 ...orioResumoLinhasAnaliticoSumarizado.jasper | Bin 99842 -> 98223 bytes
 ...torioResumoLinhasAnaliticoSumarizado.jrxml | 214 ++++++++----------
 .../RelatorioLinhasHorarioController.java     |   5 +-
 .../RelatorioResumoLinhasController.java      |   7 +-
 web/WEB-INF/i3-label_pt_BR.label              |   4 +-
 10 files changed, 206 insertions(+), 225 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java
index ce4b9613b..872f55a9c 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java
@@ -170,11 +170,11 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio {
 				sqlSb.append("         INTERESTADUAL, ");
 				sqlSb.append("         GRUPO_LINHA, ");
 				sqlSb.append("         EXTENSAO_KM, ");
-				sqlSb.append("         RECEITA_SEGURO, ");
+				sqlSb.append("         SUM(importeseguro) AS RECEITA_SEGURO, ");
 				sqlSb.append("         RECEITA_BAGAGEM, ");
 				sqlSb.append("         RECEITA_SEGURO_OUTROS, ");
-				sqlSb.append("         RECEITA_PEDAGIO, ");
-				sqlSb.append("         RECEITA_EMBARQUE, ");
+				sqlSb.append("         SUM(importepedagio) AS RECEITA_PEDAGIO, ");
+				sqlSb.append("         SUM(importetaxaembarque) AS RECEITA_EMBARQUE, ");
 				sqlSb.append("         SUM(PASSAGEIROS) AS PASSAGEIROS, ");
 				sqlSb.append("         VIAGENS_EXTRA, ");
 				sqlSb.append("         VIAGENS, ");
@@ -203,11 +203,11 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio {
 				sqlSb.append("           AND RS.TRAMO_ID  = TR.TRAMO_ID ");
 				sqlSb.append("           AND RS.ACTIVO    = 1 ");
 				sqlSb.append("           ) EXTENSAO_KM, ");
-				sqlSb.append("           NVL(SUM(NVL(BL.IMPORTESEGURO,0)), 0) RECEITA_SEGURO, ");
+				sqlSb.append("           BL.IMPORTESEGURO, ");
 				sqlSb.append("           0 RECEITA_BAGAGEM, ");
 				sqlSb.append("           0 RECEITA_SEGURO_OUTROS, ");
-				sqlSb.append("           SUM(NVL(BL.IMPORTEPEDAGIO,0)) RECEITA_PEDAGIO, ");
-				sqlSb.append("           SUM(NVL(BL.IMPORTETAXAEMBARQUE,0)) RECEITA_EMBARQUE, ");
+				sqlSb.append("           BL.IMPORTEPEDAGIO, ");
+				sqlSb.append("           BL.IMPORTETAXAEMBARQUE, ");
 				sqlSb.append("          COUNT(DISTINCT BOLETO_ID) PASSAGEIROS, ");
 				sqlSb.append("           COUNT(DISTINCT ");
 				sqlSb.append("           CASE ");
@@ -270,7 +270,10 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio {
 				sqlSb.append(" RT.INDSENTIDOIDA, ");
 				sqlSb.append(" CS.CVECLASE, ");
 				sqlSb.append(" BL.BOLETO_ID, ");
-				sqlSb.append(" BL.preciopagado ");
+				sqlSb.append(" BL.preciopagado, ");
+				sqlSb.append(" BL.importeseguro, ");
+				sqlSb.append(" BL.importepedagio, ");
+				sqlSb.append(" BL.importetaxaembarque ");
 				sqlSb.append(" ) DADOS ");
 				sqlSb.append(" GROUP BY RUTA_ID, ");
 				sqlSb.append(" INDSENTIDOIDA, ");
@@ -281,11 +284,11 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio {
 				sqlSb.append(" INTERESTADUAL,  ");
 				sqlSb.append(" GRUPO_LINHA,   ");
 				sqlSb.append(" EXTENSAO_KM,  ");
-				sqlSb.append(" RECEITA_SEGURO,   ");
+				sqlSb.append(" importeseguro,   ");
 				sqlSb.append(" RECEITA_BAGAGEM,  ");
 				sqlSb.append(" RECEITA_SEGURO_OUTROS,   ");
-				sqlSb.append(" RECEITA_PEDAGIO,  ");
-				sqlSb.append(" RECEITA_EMBARQUE,   ");
+				sqlSb.append(" importepedagio,  ");
+				sqlSb.append(" importetaxaembarque,   ");
 				sqlSb.append(" PASSAGEIROS,      ");
 				sqlSb.append(" VIAGENS_EXTRA,  ");
 				sqlSb.append(" VIAGENS,  ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper
index 74267841fb54266d739524b925392b8dffb1df9e..390200ff0f1676821335cd6a6b28b06610910adb 100644
GIT binary patch
delta 595
zcmcb(l)Y~$`vx{a)^-L42L8z#j6^pp2rgn{WZisU{5Ln_ETD+yW)>9-M#hz3W}2!M
zBdZ((1LJNm_ncZA<KzztEQ~k7+$N0<LB{sY+*Tb-tb#xTr%g@__TBu{#*mSf56E2(
z=4RME02vIDndW5*G8n{^^f7`N4C2o91#(q^_S^)^D*AurV_gF@;`L_fxYbM$=H$}}
zcUe<_YG!R-o2bCZ31$M-a8KTtsJi)gQWwwUJI|FSug?Dg^_^gm=H!b7GLv6TR@y9F
zc$5?93ZT$trfNH&D>ggUWWrnk61`EohY9Ke5cg0+7$4LVAg){gewY_QT;oa1;!sOI
zY}K5cvhoTe*Jj^UIqX0yfC8HzZv=-Ri0Qf+9)ck5+AVg_5ZwG>>pp(QX<+p?j>a>w
zP6PUdVYAJN$4pS83m<4s_C0-tk$<z!nL?1!K!MH2FN2K+F*UEkjRtWiUV|A8R`~b&
zRFLr?nLW>Q7@@}Nz6|7MVKz25ncVP2ftk^uV)DUR+M6$a>B<o@GBhx^G%_;+O2(U-
dnVFdyZ_iC+lr0p-lqi{QAkHW^efK3sF#z#u&RPHf

delta 675
zcmeBM%6@Sv`vx{a)@B9<2Fb~as-l|}1Q)R}Do#%PFUhH(px~Zbl$cXIxlvGl;sNf>
zpT$peGfoF8)7<<**@BUA*=9x6WJXp=1_s6*V9`x#ZH%nCK<-5_H%+5Mkg<95d&>?c
zR(_xjb0%-__T7Ba#*mSf3&>p!=K9z@02vCBsq!)f8M?u{9%d*=w9(fHW+;fu>i?CG
zbw5!1*3JK8S2MBB0x>7APq@q41+=(i^Tb32MksSz(q^8?`PbAYcjy0L?FFjipRACt
zIeBA&%;al{>YG0l9N`4o3>4aYugVT+GnnaC;{dZAB(tS<4-?c&Anv?|Fg~c`L0qN&
z{V=bAxcrlt#i3!zxJz@g!^$g+a+3}Ji*N;(CMksEmn7y`O*T{#pDb{OW3qiE*JQq3
zGMiIY$+81o0aU+v^+r&jf|<OVtzfPI$&_xfgM|Tz`*7=2e#SXqg$s_xGjW2W59mLp
z$qC0*H|w6*#RPT5!F!sMMNePhmITHn6l{KVx)5X`P-=7QWw3=H=JP9X3qf4}Yj6ue
z+}+nf7H$rFK9vz-^5)ks0=bzO4JJE$QD9>+v@|iRm~5A!y}9p8SB|Kmfq|K&fw8%n
zsX@G<v5~o<IXeU6^o3=NYTJVo8NU<=V=5?_9I#w&x<LXXC$CpxSz@wter`c#PHGVV
D)_LBX

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml
index c076969ba..e7903e94c 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.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="RelatorioResumoLinhas" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
 	<property name="ireport.zoom" value="3.138428376721017"/>
-	<property name="ireport.x" value="1946"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="374"/>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
 		<box>
@@ -375,7 +375,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 					</graphicElement>
 				</line>
 				<textField>
-					<reportElement uuid="9bf6af16-4242-4e39-b90e-3e0d3fe8cbdb" x="25" y="2" width="131" height="9"/>
+					<reportElement uuid="9bf6af16-4242-4e39-b90e-3e0d3fe8cbdb" x="0" y="2" width="150" height="9"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$F{INTERESTADUAL}.equals( "S" )?"Linhas Interestaduais":"Linhas Intermunicipais"]]></textFieldExpression>
 				</textField>
@@ -384,9 +384,9 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 		<groupFooter>
 			<band height="10">
 				<staticText>
-					<reportElement uuid="f949ef6f-903f-45d8-b89f-d16f49e67494" x="25" y="0" width="131" height="10"/>
+					<reportElement uuid="f949ef6f-903f-45d8-b89f-d16f49e67494" x="15" y="0" width="135" height="10"/>
 					<textElement/>
-					<text><![CDATA[                    Sub Total:]]></text>
+					<text><![CDATA[Sub Total:]]></text>
 				</staticText>
 				<textField pattern="#,##0.00">
 					<reportElement uuid="041e4886-2c87-4687-8f2e-f2fbbe18729d" x="235" y="0" width="33" height="10"/>
@@ -414,24 +414,24 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 					<textFieldExpression><![CDATA[$V{RECEITA_TOTAL_2}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="a3767a6a-79b9-4478-b3e4-b162ebd8b6c4" x="407" y="0" width="15" height="10"/>
+					<reportElement uuid="a3767a6a-79b9-4478-b3e4-b162ebd8b6c4" x="410" y="0" width="15" height="10"/>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{VIAGENS_2}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="f8ff7dd1-5302-477c-9218-4a1f26f0e100" x="422" y="0" width="18" height="10"/>
+					<reportElement uuid="f8ff7dd1-5302-477c-9218-4a1f26f0e100" x="425" y="0" width="18" height="10"/>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{VIAGENS_EXTRA_2}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="643a74d1-fc89-4246-b384-91b38e32c618" x="440" y="0" width="25" height="10"/>
+					<reportElement uuid="643a74d1-fc89-4246-b384-91b38e32c618" x="443" y="0" width="30" height="10"/>
 					<textElement textAlignment="Right">
 						<font size="5"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{VIAGENS_TOTAL_2}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="6b176547-673b-4b46-8c0c-911763d52325" x="465" y="0" width="45" height="10"/>
+					<reportElement uuid="6b176547-673b-4b46-8c0c-911763d52325" x="473" y="0" width="37" height="10"/>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{KM_RODADO_2}]]></textFieldExpression>
 				</textField>
@@ -490,7 +490,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 					<textFieldExpression><![CDATA[$V{IAP_2}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="5585fe48-2797-482a-8008-0e472178c77e" x="156" y="0" width="79" height="10"/>
+					<reportElement uuid="5585fe48-2797-482a-8008-0e472178c77e" x="150" y="0" width="79" height="10"/>
 					<textElement>
 						<font size="5"/>
 					</textElement>
@@ -504,7 +504,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 		<groupHeader>
 			<band height="10">
 				<textField>
-					<reportElement uuid="2bce894e-4df1-466e-90ba-6bd518ea4376" x="25" y="1" width="131" height="9"/>
+					<reportElement uuid="2bce894e-4df1-466e-90ba-6bd518ea4376" x="0" y="1" width="150" height="9"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$F{GRUPO_LINHA}]]></textFieldExpression>
 				</textField>
@@ -519,9 +519,9 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 		<groupFooter>
 			<band height="13">
 				<staticText>
-					<reportElement uuid="eb3f487a-567e-4e6c-8859-09279ab6e95c" x="25" y="3" width="131" height="10"/>
+					<reportElement uuid="eb3f487a-567e-4e6c-8859-09279ab6e95c" x="15" y="3" width="135" height="10"/>
 					<textElement/>
-					<text><![CDATA[          Total do Grupo:]]></text>
+					<text><![CDATA[Total do Grupo:]]></text>
 				</staticText>
 				<textField pattern="#,##0.00">
 					<reportElement uuid="db1cd701-47d4-441a-ab78-f9e7aa686ad0" x="235" y="3" width="33" height="10"/>
@@ -549,24 +549,24 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 					<textFieldExpression><![CDATA[$V{RECEITA_TOTAL_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="2e01f4b5-2734-4b58-a01f-859148abe053" x="407" y="3" width="15" height="10"/>
+					<reportElement uuid="2e01f4b5-2734-4b58-a01f-859148abe053" x="410" y="3" width="15" height="10"/>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{VIAGENS_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="c4065256-4776-41b7-9d17-0d7a9e8e4de9" x="422" y="3" width="18" height="10"/>
+					<reportElement uuid="c4065256-4776-41b7-9d17-0d7a9e8e4de9" x="425" y="3" width="18" height="10"/>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{VIAGENS_EXTRA_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="1a602ed2-d5d6-4ded-b707-c7e683b0587b" x="440" y="3" width="25" height="10"/>
+					<reportElement uuid="1a602ed2-d5d6-4ded-b707-c7e683b0587b" x="443" y="3" width="30" height="10"/>
 					<textElement textAlignment="Right">
 						<font size="5"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{VIAGENS_TOTAL_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="a63b3e4d-5cc2-44c0-8e6c-7cb541ddf940" x="465" y="3" width="45" height="10"/>
+					<reportElement uuid="a63b3e4d-5cc2-44c0-8e6c-7cb541ddf940" x="473" y="3" width="37" height="10"/>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{KM_RODADO_1}]]></textFieldExpression>
 				</textField>
@@ -625,7 +625,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 					<textFieldExpression><![CDATA[$V{IAP_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="8ff26ab0-49ff-4c80-8c96-9a7eefa0c38a" x="156" y="3" width="79" height="10"/>
+					<reportElement uuid="8ff26ab0-49ff-4c80-8c96-9a7eefa0c38a" x="150" y="3" width="79" height="10"/>
 					<textElement>
 						<font size="5"/>
 					</textElement>
@@ -792,7 +792,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 				<text><![CDATA[Cod.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="f39411fa-dfc8-4b51-a705-53b2ed781e10" mode="Transparent" x="15" y="16" width="131" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="f39411fa-dfc8-4b51-a705-53b2ed781e10" mode="Transparent" x="15" y="16" width="135" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -800,7 +800,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 				<text><![CDATA[Linha]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="9d8575a4-d773-4713-abc1-11741c586b24" mode="Transparent" x="156" y="16" width="15" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="9d8575a4-d773-4713-abc1-11741c586b24" mode="Transparent" x="150" y="16" width="17" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -808,7 +808,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 				<text><![CDATA[Lot.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="7a75fbcb-13b1-47a1-885d-e7255206654c" mode="Transparent" x="171" y="16" width="10" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="7a75fbcb-13b1-47a1-885d-e7255206654c" mode="Transparent" x="167" y="16" width="14" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -872,7 +872,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 				<text><![CDATA[Total]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="859a71a0-b584-489e-b099-cc127b5ea027" mode="Transparent" x="407" y="16" width="15" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="859a71a0-b584-489e-b099-cc127b5ea027" mode="Transparent" x="410" y="16" width="15" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -880,7 +880,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 				<text><![CDATA[Ord.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="b9328b6f-5e2b-4412-a2bb-f1ab50a00ae8" mode="Transparent" x="422" y="16" width="18" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="b9328b6f-5e2b-4412-a2bb-f1ab50a00ae8" mode="Transparent" x="425" y="16" width="18" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -888,7 +888,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 				<text><![CDATA[Extra]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="25946740-ff9b-4421-92c4-237b7b5c06c5" mode="Transparent" x="440" y="16" width="25" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="25946740-ff9b-4421-92c4-237b7b5c06c5" mode="Transparent" x="443" y="16" width="30" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -896,7 +896,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 				<text><![CDATA[Total]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="0c75fb19-0d9a-4b66-9e3c-4d714cae6079" mode="Transparent" x="465" y="16" width="45" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="0c75fb19-0d9a-4b66-9e3c-4d714cae6079" mode="Transparent" x="473" y="16" width="37" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -977,22 +977,22 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 			</staticText>
 			<elementGroup>
 				<staticText>
-					<reportElement uuid="c44f403d-3437-470d-9ec6-de363516687e" x="181" y="2" width="191" height="8"/>
+					<reportElement uuid="c44f403d-3437-470d-9ec6-de363516687e" x="235" y="2" width="172" height="8"/>
 					<textElement textAlignment="Center"/>
 					<text><![CDATA[RECEITA]]></text>
 				</staticText>
 				<line>
-					<reportElement uuid="3031bb9a-2f49-447e-9b79-738d5a765c61" x="181" y="11" width="154" height="1"/>
+					<reportElement uuid="3031bb9a-2f49-447e-9b79-738d5a765c61" x="235" y="11" width="172" height="1"/>
 				</line>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement uuid="de763f1e-efcb-42a3-895e-5e0f76df37a1" x="372" y="2" width="138" height="8"/>
+					<reportElement uuid="de763f1e-efcb-42a3-895e-5e0f76df37a1" x="410" y="2" width="100" height="8"/>
 					<textElement textAlignment="Center"/>
 					<text><![CDATA[VIAGENS]]></text>
 				</staticText>
 				<line>
-					<reportElement uuid="b0b782a1-761e-46b7-8aec-6caedfa6a501" x="372" y="11" width="138" height="1"/>
+					<reportElement uuid="b0b782a1-761e-46b7-8aec-6caedfa6a501" x="410" y="11" width="100" height="1"/>
 				</line>
 			</elementGroup>
 			<elementGroup>
@@ -1029,14 +1029,14 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 		<band height="16" splitType="Stretch">
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="3806ad9e-a061-446b-b913-8e5154e42c17" x="0" y="0" width="15" height="9"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
+				<textElement verticalAlignment="Middle">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{NUMRUTA}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="9c07acec-d267-4686-b7b0-edbb1899fc95" x="15" y="0" width="141" height="16"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<reportElement uuid="9c07acec-d267-4686-b7b0-edbb1899fc95" x="15" y="0" width="135" height="16"/>
+				<textElement verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{DESCRUTA}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
@@ -1072,17 +1072,17 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 				<textFieldExpression><![CDATA[$F{RECEITA_TARIFA}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="3b54d0f0-816a-42e3-949a-ff8a764c7926" x="407" y="0" width="15" height="9"/>
+				<reportElement uuid="3b54d0f0-816a-42e3-949a-ff8a764c7926" x="410" y="0" width="15" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{VIAGENS}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e60bbc3e-0f01-4e38-9a2f-6a870199e999" x="422" y="0" width="18" height="9"/>
+				<reportElement uuid="e60bbc3e-0f01-4e38-9a2f-6a870199e999" x="425" y="0" width="18" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{VIAGENS_EXTRA}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="2f23db7f-13ce-45c7-b72a-cd019807d422" x="440" y="0" width="25" height="9"/>
+				<reportElement uuid="2f23db7f-13ce-45c7-b72a-cd019807d422" x="443" y="0" width="30" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="5"/>
 				</textElement>
@@ -1094,7 +1094,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 				<textFieldExpression><![CDATA[$F{RECEITA_TOTAL}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="f53b87cd-bf78-423c-8370-da117fbfe57e" x="465" y="0" width="45" height="9"/>
+				<reportElement uuid="f53b87cd-bf78-423c-8370-da117fbfe57e" x="473" y="0" width="37" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{KM_RODADO}]]></textFieldExpression>
 			</textField>
@@ -1146,7 +1146,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 				<textFieldExpression><![CDATA[$F{IAP}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="b240b92a-4144-4f01-a5b9-1cdc8d25382b" x="171" y="0" width="10" height="9"/>
+				<reportElement uuid="b240b92a-4144-4f01-a5b9-1cdc8d25382b" x="167" y="0" width="14" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{CVE_CLASE_SERVICIO}]]></textFieldExpression>
 			</textField>
@@ -1158,7 +1158,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 				<textFieldExpression><![CDATA[$F{PAX_OFERTADO}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="d4414d92-bb36-40e7-8677-ada488bb71a6" x="156" y="0" width="15" height="9"/>
+				<reportElement uuid="d4414d92-bb36-40e7-8677-ada488bb71a6" x="150" y="0" width="17" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{ASSENTOS}]]></textFieldExpression>
 			</textField>
@@ -1167,9 +1167,9 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 	<columnFooter>
 		<band height="10" splitType="Immediate">
 			<staticText>
-				<reportElement uuid="f4025873-ca53-4e07-ba04-997d5df4df7b" x="25" y="0" width="131" height="10"/>
+				<reportElement uuid="f4025873-ca53-4e07-ba04-997d5df4df7b" x="15" y="0" width="135" height="10"/>
 				<textElement/>
-				<text><![CDATA[                            Geral]]></text>
+				<text><![CDATA[Geral]]></text>
 			</staticText>
 			<textField pattern="#,##0.00">
 				<reportElement uuid="3bfef22c-0a77-422c-ac1d-f4d2535b46ff" x="235" y="0" width="33" height="10"/>
@@ -1197,24 +1197,24 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 				<textFieldExpression><![CDATA[$V{RECEITA_TOTAL_3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="7d747ce5-937c-48ee-9fdb-6f346ff4446b" x="407" y="0" width="15" height="10"/>
+				<reportElement uuid="7d747ce5-937c-48ee-9fdb-6f346ff4446b" x="410" y="0" width="15" height="10"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{VIAGENS_3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="2284552a-20c3-494b-a40c-6237001ef20b" x="422" y="0" width="18" height="10"/>
+				<reportElement uuid="2284552a-20c3-494b-a40c-6237001ef20b" x="425" y="0" width="18" height="10"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{VIAGENS_EXTRA_3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="da8315b5-044f-40eb-88d7-c75acc2fc01d" x="440" y="0" width="25" height="10"/>
+				<reportElement uuid="da8315b5-044f-40eb-88d7-c75acc2fc01d" x="443" y="0" width="30" height="10"/>
 				<textElement textAlignment="Right">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{VIAGENS_TOTAL_3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="29a87e9a-930a-417c-b568-f7e030a447ae" x="465" y="0" width="45" height="10"/>
+				<reportElement uuid="29a87e9a-930a-417c-b568-f7e030a447ae" x="473" y="0" width="37" height="10"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{KM_RODADO_3}]]></textFieldExpression>
 			</textField>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.jasper
index 93963dde0408e8ef1cb08690763df8fcb15c4bb7..ee085489434c59f078dd8da0a6ba5e92a79a68d4 100644
GIT binary patch
delta 617
zcmcb8h~>s1mJMuzj8itV3(n<awP0Xi_&+&TUTgDZDOqM#TLuQkKp<Chvz(k2BWog%
zyJ&N)d?F)j00RS4I#}Ubg)By(_6VgAW>!<6_EVcTsx~u1P1>mHySYu>gb`{Ih|8mC
z#>nak)Gjv}#GRt$!N{1f`L6a}CdP!xv-KWAlx}X+SApqTWl+JmX!0rp&CNcBHcYH$
zKue~8_1-czX9PM($W#YNfkk@EoM3JP8a`RULT|E;n)&8di_PpnH(EMmFhblo+15dG
z^La-*Mn;Rxe9rYSn?RzwU2I_P194T|92lWig1D32-C*Hx&m$dX*F6u-&Bb1PqO4PZ
zZey6tn5sE>ef%$I7%--4ZN8D<1+xPvxj7&S7@CkU0C9IDyTA-(Ooaz7NM=HsFcZ+>
zOETVosEOG?k6LWrms0^XY_oM<GRz?BJk8B#@?i!|2662QEub#kTwOE;6iWgn(cGE_
zW`zuOEbJu=g2s9#rbb5QhDL@a#+Js0hL#`+juHk&gNouJ2A#=<?CP8M)t9(Q7#SK^
wm|B_|8kiWy8(SEe7@D&)FfsyFJiM#CIrrG|C{aumB@9MD17xPVDl&=z06&hX4FCWD

delta 601
zcmca{h~@SnmJMuzjLn<b1?O_IDl#xI{GS{vueJHIlq@r=E&~IjJCLinSx(N1kyQxD
z-LW}VJ`v1h>H{l$tB}PA)E=P}!ptfQ)c$DmM%89Us7V`DeK)tMn=nF60&#gX%@|ol
z7#NtGCWE+Bv^*FYJvZOg-pj=3IeE6;Lx|GNjruAuU8@W#7^hBNWuUp)$Iym})d*<G
z6tLb~#^#KSQ#T8l>HsOQNROElBdZ6{@O%(=vVw))<XvVKo7*flu>;*`>5#z)apPoL
z2hGjr9qkwy6*u!a*TZZAiSBl>fw>RFRdsV<gjxyWPIh;Lg~L6MbXYjt^U&N}?8PU_
z+6;6X!(_%(&B^QIe?h~5F;#2xjRY^49YD#=0ZG8ngoFWzyCc~JW+-DSJa9oW6Vim4
zfDT`h@diXq%m#W?ar3^M3aDY5t@Dy$23hB6Za$L_GiWl1YgcFib>ZgfqA8$Q5-5r0
zRyQ&&WT<0dFJTZg)-yD=Ffp<)Ha9ajGBhwW2T5?0Ft7mGCY$@~7q|%-np&7znwuB`
hQM{?Cp^1s%X2)X}qC_#pOBjqM8?wtxcT!{&0{{|YpsWA@

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.jrxml
index 6645aef14..cf3e83c4e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.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="RelatorioResumoLinhas" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
-	<property name="ireport.zoom" value="3.138428376721017"/>
-	<property name="ireport.x" value="1014"/>
-	<property name="ireport.y" value="225"/>
+	<property name="ireport.zoom" value="3.452271214393119"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="206"/>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
 		<box>
@@ -245,7 +245,7 @@
 					</graphicElement>
 				</line>
 				<textField>
-					<reportElement uuid="9bf6af16-4242-4e39-b90e-3e0d3fe8cbdb" x="0" y="2" width="131" height="9"/>
+					<reportElement uuid="9bf6af16-4242-4e39-b90e-3e0d3fe8cbdb" x="0" y="2" width="148" height="9"/>
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
@@ -256,40 +256,40 @@
 		<groupFooter>
 			<band height="13">
 				<staticText>
-					<reportElement uuid="f949ef6f-903f-45d8-b89f-d16f49e67494" x="0" y="0" width="131" height="10"/>
+					<reportElement uuid="f949ef6f-903f-45d8-b89f-d16f49e67494" x="0" y="0" width="148" height="10"/>
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Sub Total:]]></text>
 				</staticText>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="041e4886-2c87-4687-8f2e-f2fbbe18729d" x="255" y="0" width="33" height="10"/>
+					<reportElement uuid="041e4886-2c87-4687-8f2e-f2fbbe18729d" x="255" y="0" width="56" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_TARIFA_INT}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="6b176547-673b-4b46-8c0c-911763d52325" x="327" y="0" width="45" height="10"/>
+					<reportElement uuid="6b176547-673b-4b46-8c0c-911763d52325" x="337" y="0" width="61" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{KM_RODADO_2}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00">
-					<reportElement uuid="06262876-8581-45b3-abcb-73c9b8996406" x="578" y="0" width="20" height="10"/>
+					<reportElement uuid="06262876-8581-45b3-abcb-73c9b8996406" x="542" y="0" width="73" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_KM_3}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="87aa214d-6238-4a44-8fd2-195865a7fff6" x="440" y="0" width="18" height="10"/>
+					<reportElement uuid="87aa214d-6238-4a44-8fd2-195865a7fff6" x="418" y="0" width="97" height="10"/>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{PASSAGEIROS_2}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="ff932989-3db9-4572-9c66-a28dd7f5b4df" x="654" y="0" width="18" height="10"/>
+					<reportElement uuid="ff932989-3db9-4572-9c66-a28dd7f5b4df" x="615" y="0" width="80" height="10"/>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{ASSENTOS_2}]]></textFieldExpression>
 				</textField>
@@ -301,7 +301,7 @@
 		<groupHeader>
 			<band height="10">
 				<textField>
-					<reportElement uuid="2bce894e-4df1-466e-90ba-6bd518ea4376" x="0" y="1" width="131" height="9"/>
+					<reportElement uuid="2bce894e-4df1-466e-90ba-6bd518ea4376" x="0" y="1" width="148" height="9"/>
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
@@ -318,40 +318,40 @@
 		<groupFooter>
 			<band height="14">
 				<staticText>
-					<reportElement uuid="eb3f487a-567e-4e6c-8859-09279ab6e95c" x="0" y="3" width="131" height="10"/>
+					<reportElement uuid="eb3f487a-567e-4e6c-8859-09279ab6e95c" x="0" y="3" width="148" height="10"/>
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Total do Grupo:]]></text>
 				</staticText>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="db1cd701-47d4-441a-ab78-f9e7aa686ad0" x="255" y="3" width="33" height="10"/>
+					<reportElement uuid="db1cd701-47d4-441a-ab78-f9e7aa686ad0" x="255" y="3" width="56" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_TARIFA_GRP}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="a63b3e4d-5cc2-44c0-8e6c-7cb541ddf940" x="327" y="3" width="45" height="10"/>
+					<reportElement uuid="a63b3e4d-5cc2-44c0-8e6c-7cb541ddf940" x="337" y="3" width="61" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{KM_RODADO_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00">
-					<reportElement uuid="a5aacae3-b107-43b0-8db3-186cd6a3f619" x="578" y="3" width="20" height="10"/>
+					<reportElement uuid="a5aacae3-b107-43b0-8db3-186cd6a3f619" x="542" y="3" width="73" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_KM_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="478fb5a6-6800-4f5d-9a3f-36db8d96e62f" x="440" y="3" width="18" height="10"/>
+					<reportElement uuid="478fb5a6-6800-4f5d-9a3f-36db8d96e62f" x="418" y="3" width="97" height="10"/>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{PASSAGEIROS_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="d141bc70-150a-4fb0-8470-b597ddfbee69" x="654" y="0" width="18" height="10"/>
+					<reportElement uuid="d141bc70-150a-4fb0-8470-b597ddfbee69" x="615" y="0" width="80" height="10"/>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{ASSENTOS_1}]]></textFieldExpression>
 				</textField>
@@ -488,7 +488,7 @@
 	<columnHeader>
 		<band height="32" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="f39411fa-dfc8-4b51-a705-53b2ed781e10" mode="Transparent" x="0" y="16" width="131" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="f39411fa-dfc8-4b51-a705-53b2ed781e10" mode="Transparent" x="0" y="16" width="148" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -496,7 +496,7 @@
 				<text><![CDATA[Linha]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="796d78cd-ff11-4469-9dbe-7abbb92f4868" mode="Transparent" x="226" y="16" width="29" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="796d78cd-ff11-4469-9dbe-7abbb92f4868" mode="Transparent" x="202" y="16" width="53" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -504,7 +504,7 @@
 				<text><![CDATA[Extensão]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="deca7e00-7f89-4dac-ad2e-89eaeb59ba6c" mode="Transparent" x="255" y="16" width="33" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="deca7e00-7f89-4dac-ad2e-89eaeb59ba6c" mode="Transparent" x="255" y="16" width="56" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -512,7 +512,7 @@
 				<text><![CDATA[Receita]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="0c75fb19-0d9a-4b66-9e3c-4d714cae6079" mode="Transparent" x="327" y="16" width="45" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="0c75fb19-0d9a-4b66-9e3c-4d714cae6079" mode="Transparent" x="337" y="16" width="61" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -520,7 +520,7 @@
 				<text><![CDATA[Km Rodado]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="31f020bf-2be6-4f3c-98ec-6dffc692dfc6" mode="Transparent" x="578" y="16" width="20" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="31f020bf-2be6-4f3c-98ec-6dffc692dfc6" mode="Transparent" x="542" y="16" width="73" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -529,29 +529,29 @@
 			</staticText>
 			<elementGroup>
 				<staticText>
-					<reportElement uuid="c44f403d-3437-470d-9ec6-de363516687e" x="215" y="2" width="73" height="8"/>
+					<reportElement uuid="c44f403d-3437-470d-9ec6-de363516687e" x="215" y="2" width="96" height="8"/>
 					<textElement textAlignment="Center">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[RECEITA]]></text>
 				</staticText>
 				<line>
-					<reportElement uuid="3031bb9a-2f49-447e-9b79-738d5a765c61" x="215" y="12" width="73" height="1"/>
+					<reportElement uuid="3031bb9a-2f49-447e-9b79-738d5a765c61" x="215" y="12" width="96" height="1"/>
 				</line>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement uuid="de763f1e-efcb-42a3-895e-5e0f76df37a1" x="327" y="2" width="45" height="8"/>
+					<reportElement uuid="de763f1e-efcb-42a3-895e-5e0f76df37a1" x="337" y="2" width="61" height="8"/>
 					<textElement textAlignment="Center">
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[VIAGENS]]></text>
 				</staticText>
 				<line>
-					<reportElement uuid="b0b782a1-761e-46b7-8aec-6caedfa6a501" x="327" y="12" width="45" height="1"/>
+					<reportElement uuid="b0b782a1-761e-46b7-8aec-6caedfa6a501" x="337" y="12" width="61" height="1"/>
 				</line>
 				<line>
-					<reportElement uuid="81088d54-7287-4ab3-af62-826428c0dd5c" x="405" y="12" width="97" height="1"/>
+					<reportElement uuid="81088d54-7287-4ab3-af62-826428c0dd5c" x="418" y="12" width="97" height="1"/>
 				</line>
 			</elementGroup>
 			<elementGroup/>
@@ -568,7 +568,7 @@
 				</line>
 			</elementGroup>
 			<staticText>
-				<reportElement uuid="46f8a00f-7194-45d0-903d-1a480659eaf2" mode="Transparent" x="148" y="16" width="50" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="46f8a00f-7194-45d0-903d-1a480659eaf2" mode="Transparent" x="148" y="16" width="54" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -576,14 +576,14 @@
 				<text><![CDATA[Classe]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="66b430c8-060a-4763-8b0a-7cd1c2d2b046" x="405" y="2" width="97" height="8"/>
+				<reportElement uuid="66b430c8-060a-4763-8b0a-7cd1c2d2b046" x="418" y="2" width="97" height="8"/>
 				<textElement textAlignment="Center">
 					<font isBold="true"/>
 				</textElement>
 				<text><![CDATA[PASSAGEIROS]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="59d8acd1-408c-498d-821c-1271f5b1d0de" mode="Transparent" x="405" y="16" width="97" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="59d8acd1-408c-498d-821c-1271f5b1d0de" mode="Transparent" x="418" y="16" width="97" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -591,8 +591,8 @@
 				<text><![CDATA[Passag. Transportados]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="013a1bf5-824b-48ad-82d3-844b63f63dfb" mode="Transparent" x="623" y="16" width="72" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+				<reportElement uuid="013a1bf5-824b-48ad-82d3-844b63f63dfb" mode="Transparent" x="615" y="16" width="80" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
@@ -603,44 +603,44 @@
 	<detail>
 		<band height="16" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="9c07acec-d267-4686-b7b0-edbb1899fc95" x="0" y="0" width="131" height="16"/>
+				<reportElement uuid="9c07acec-d267-4686-b7b0-edbb1899fc95" x="0" y="0" width="148" height="16"/>
 				<textElement verticalAlignment="Middle">
 					<font isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{DESCRUTA}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="0e3f1f2d-a83f-4e9a-ba34-db10a68e9c6c" x="226" y="0" width="29" height="9"/>
+				<reportElement uuid="0e3f1f2d-a83f-4e9a-ba34-db10a68e9c6c" x="202" y="0" width="53" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{EXTENSAO_KM}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="f0e8fc9a-4e83-4e23-a959-85701a6a2513" x="255" y="0" width="33" height="9"/>
+				<reportElement uuid="f0e8fc9a-4e83-4e23-a959-85701a6a2513" x="255" y="0" width="56" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{RECEITA_TARIFA_SEGURO}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="f53b87cd-bf78-423c-8370-da117fbfe57e" x="327" y="0" width="45" height="9"/>
+				<reportElement uuid="f53b87cd-bf78-423c-8370-da117fbfe57e" x="337" y="0" width="61" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{KM_RODADO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00">
-				<reportElement uuid="803a40d7-383b-4a69-98a3-fe5020830ac4" x="578" y="0" width="20" height="10"/>
+				<reportElement uuid="803a40d7-383b-4a69-98a3-fe5020830ac4" x="542" y="0" width="73" height="10"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{RECEITA_KM_2}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="4a88394a-4587-42a6-ae41-94f123536176" x="148" y="0" width="50" height="9"/>
+				<reportElement uuid="4a88394a-4587-42a6-ae41-94f123536176" x="148" y="0" width="54" height="9"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{DESC_CLASE_SERVICIO}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="deefcbc0-9738-4e8e-a2b2-127b6a5d715f" x="440" y="1" width="18" height="9"/>
+				<reportElement uuid="deefcbc0-9738-4e8e-a2b2-127b6a5d715f" x="418" y="1" width="97" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{PASSAGEIROS}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="29743967-d3ce-4a42-b6c5-75de9d9afce0" x="654" y="1" width="18" height="9"/>
+				<reportElement uuid="29743967-d3ce-4a42-b6c5-75de9d9afce0" x="615" y="1" width="80" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{ASSENTOS}]]></textFieldExpression>
 			</textField>
@@ -649,33 +649,33 @@
 	<columnFooter>
 		<band height="10" splitType="Immediate">
 			<staticText>
-				<reportElement uuid="f4025873-ca53-4e07-ba04-997d5df4df7b" x="0" y="0" width="131" height="10"/>
+				<reportElement uuid="f4025873-ca53-4e07-ba04-997d5df4df7b" x="0" y="0" width="148" height="10"/>
 				<textElement>
 					<font isBold="true"/>
 				</textElement>
 				<text><![CDATA[Geral]]></text>
 			</staticText>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="3bfef22c-0a77-422c-ac1d-f4d2535b46ff" x="255" y="0" width="33" height="10"/>
+				<reportElement uuid="3bfef22c-0a77-422c-ac1d-f4d2535b46ff" x="255" y="0" width="56" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{RECEITA_TARIFA_GERAL}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="29a87e9a-930a-417c-b568-f7e030a447ae" x="327" y="0" width="45" height="10"/>
+				<reportElement uuid="29a87e9a-930a-417c-b568-f7e030a447ae" x="337" y="0" width="61" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{KM_RODADO_3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b8b59c66-dd76-4f22-ac42-208cbfc41857" x="440" y="0" width="18" height="10"/>
+				<reportElement uuid="b8b59c66-dd76-4f22-ac42-208cbfc41857" x="418" y="0" width="97" height="10"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{PASSAGEIROS_3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="5e2bc7f8-57bf-4c94-ac64-4d890f75310b" x="654" y="0" width="18" height="10"/>
+				<reportElement uuid="5e2bc7f8-57bf-4c94-ac64-4d890f75310b" x="615" y="0" width="80" height="10"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{ASSENTOS_3}]]></textFieldExpression>
 			</textField>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jasper
index 3114ada8c214e1822d1e12c8efc84c3770aa2878..3a27e775c348911972a7189dd958bcb20e17f6b5 100644
GIT binary patch
delta 19377
zcma)@dwf*I*~fP_*=#l!OtQHrBq1yiZh<7+1>z>zEDO2cDQG@XBZ2_}1c)F6@KUu@
zgY&W5QWc`sf`wWdMQRn5TC^=%qCoLg5frhCMYP%?6@2G;p4sd<dnOC~@$k(4X3p<B
zmpy0BIh#$J!=CxU^1CmRtQL3c@|Lz0d}D0pmRBNsrzZc{Y#C`Xu`C{&F|zkuYDS1<
zv?zLdV>4DU)`6ey$*g7k>!G81bBD}kma#&95kG$_dls|UMe#E%raPuE%V1Ib9*diX
z&19CLCX+b@i|2;_l$p)bsbS7EW=R*)LM#p%HJw?~MDcDcc8>NiOO_~Z$Ksb`L@_}W
zU%}!nxg`vU%}23#d|WwWmocr(Yhu=v)uASnDTT9XN&L_G^CE1s>uc*gr5;xa@0mNK
zcUD0tV|VtJPZ-BWuU}?bZ@Qtw6jto2sB_h<fTGhRB5U-Ac1-z}-1M*}NSpY}6O(;u
zU#@)$ecFz#t4*dq)wPR%SQ7&YwMK#GO#0lCBUm5dEtTc`=E)NhHMZ#L_l{f)A7HqZ
zJIC6?sLTO?QU!ok&;iKCr-~A-E$DG8|Ee&FwelrXMp%*r(rbwH>6CG4^#~FWG+cLp
zgkd#uQ5m@?Rd8tq9hYqE=UOefzM49ky@yPTrUf0Qp8yVqdk}}ph(oCYM=R)XWMe<h
zJrbwm+A;Dw12gyawLy`#0uqLY5sAu(M5zKvE9j79V?WZv66yQtW9WN}qqJs5P^6uJ
zgyBg<qB0^;szA~TIwaZHkMyKOx@+cGasGf2`e9~JoPB_Up%-zej5w4kaI}IBM>h83
z^hzAtb>nzZaRtBUx}Y$x0}O@(2t#Frp;Q5*6?8DNu^;Augz0vUlIKwvpQxgsNXGyP
zLmwhh8IdSeAZZ01l5Ffp>XS%4?i_h82c+)eph%wp5{8qAL}fs-V9K|QvS(3+Pl!$j
zA*=f#PD+TaB_re&1R(6Lpb*~x1comWg3359lq$wWE9j79V?WZD5@~R0j=YKilDBj~
zq*JBoks$)f3_)CydaCVVROUn6{b_ZTJ(E5)jtjOlhj2f{<^IVT4cAT}NShUuAPxvH
zL?Z!}kwB(EK&gU2*6AlOM@xcXo-y)@4G>Rwf<g=d2n^{6L1l!HDL_!FfRJ_k5a|+P
z_v{gJp8ycU=LCfq4-gneBLtNZLZ$#gsRBaQ@k5N35aY{+%iRe;>?jKgQ3wzirXd8C
z5kjT_L8$^l*6~A31BjSb-yXx=VG1d)a=~s#Zjpd#R7Fsx3Sh$EK_)6AlT3k$QU#N&
z<7e{7ftgU5BR6IMF}^w|#PtAyp$Q?Vj1V#f2uc+YvW_33NkUAk885zj0I;tnC_ozk
zU|4_vR7L=q0sy5709nTmus{MFsBL7ccwbX0pHP>@>cy@zJ8}(pVdz9JDx;T7g;zeM
z3NI;$NylAgy_|h>XYY4)hnaLc-H^k6%%dA0V?RargN;7-E#QvfL3F1wy2}*YDOI>j
z!QlQN|4CC8+r)P@Inc5w>KE;>&4nGb`6oPcZYg^NNjA*&k!%ME!(&K7Wh9X)kWi{1
zk%EEbG4A@2Ly#;Ikt}!qC?{%%o~D4u%(JuKAkoZuKB8xU2*Yk9qB0W66o@EQ5J|y6
zw3~;_&l5xw=R2fj$NZeQ=QTu~!kA6LFD~2!T)-u}vnA+~eHmaeynwJ&Mp&5&*i1?l
zu(FPS$-Y2Kwzv1jb&TEJn|HIgmAa?5t97M0j&4QT0kV-IhwIy$K!D*85>OclWGV=1
zDOC`VfQ#6pxg#<kf)(A~VX}3!c6QWu+}_qojr&*nA@82SEQO!A^(_{|cP~sco8QBU
zJiRc>+ZV&Kqs$)y8HNv#jLJwRQ<z9f6=YH{OymbVwk?mJSk&Nith#Mxl=%xV!|*wp
zQ5nr-3TBil%%os2`&^i<iFr>f2NR6BDF$q)qtCS!@j*96vj2h~AA4hMY~ab@zexI<
z#k1n^{#|vDAxnxKVd9t}7($7xLNgI0gmKnx52K2_XGwp$agjZRK84xRor*$2(LHJD
z+?WoP^VX%sj(Bj!5T|e^6`f@Y&N2mON{!BO=-k~tFUG5KPFPkPkqyomc;7|4mC|hV
zA_;pbQ}CkH=p`PKh}96eydfSRnW+38Twd%L4}KVO6+I;t-DL_rl_|JWYIM&<_q$ir
z$J^nVi^@H`qu4PM+%Zg7xRVO*7EHPGk{A*BDY#Q=bQe!<MBguWl*HpB9+i9h%3{YH
zaL3?LxRZ)~mnrmJrr=Jg(cOdYx2&2Sk580T?k85c9Zlelp+VtJD!R)Q++_;xlp5U|
z(Ea%8+41=BE6{z*9cjF}v&hj3?ig-TxRZ+RG6i>;f;*)~_nXkY^!CPB^YlP#*k`<P
zd$9w)jUgD8DXd9FYng(zOu?E`qxCYh-oK_a9v{!C-1FBKJ2rqjhV=?}Qqf(e;4V{e
zr_|`a9^G^9sE^Nrr-6a)Tkg2t@c=ku*sO3S6`f@Y&N2mON{!B&(Ya?`eLOyR40MK3
zcdRdVJOb_*wkq67MR%EkyG+5IQltA;bWiQ7hSQAssLK5pUB!;4!5za6g*&O}E>m!q
zDY#Q=bl-vQ4{n$nb6Mpax3So<51cXVRXCH1&N2mOnSwK=M(4fg9KNY69v?!g+&68?
zG>c93mX+C#g8+fyH3bBz2q9B|kSRb=YJ_+VAv*7@jK>Gmfe`Rr|IeMyVIl8;J%&Do
zJ*i-C!PMIm$;5e9ehmJU8vXmw|Lk3x%^@G+9*5sOb6Cj7;D+Ip!i`kytW2S^G6geA
zjb^8~bIjP@jrUYp?I9P%2FzMfUtUvR=Uf4Hm$>tRH2HZ|jjPntRO$ab9_xpfxN3{_
z4N_2u_P`@`S8biMq~2NPZ<d5=q`RiRs<OGvQ!z_pB{f%5ovWhOS=l_NT()cP&P>I2
zgKAvGE>E4axz^>bukq0cISu7&d~%V~?R2{|&CMYf`Qir$n?;|D2di_|cuIX7#)DP4
zN}O(w#taUY)txL4CaJ5OwY9?2Q&U;%r-qtax)WqgIg||^QLiGP*8jRwp_UkMIexyb
z)K%8?kDp+Zsys$>fSQ2AV4G9kTvJ)%EYUEB2!)S5pGqfv90fUM8t~@wD&sKdb(g<$
ziD(w#0}V1;NUNERIBXeK<!sW<aa!*P{+xv^;xXaFxcL|R!_CK5ie+eim*?%B$_K?p
zm_s+?7h=TL;;wF?gkpHW_<bOun}k`K{jE;WzO2y++UJ5kL40+f=O%ealC?hc0r)oQ
z{&kolYFFNvRkyUGrHyZVK3TCzls&lVm+r2u&;txVSM-2XMGv%st_NB{*8?dCRBaDJ
z)`$KazWjXdBlU_q1_}E9Bkryp0E*!$1t_TsP_3W?)e1ULDHuVYLeRG#Z49`%kdU>H
zxu@?1NDR*^AW2m~qQH9!?FH0WUe0t_vT*>``p{>Q%CqhIfEy1<b$FY*>ouUla6myt
zs)9-@=!Q-!=oqCCz$oTeyu=W5d~kc6V&^JBXZ4hJg}x1>7!E5)NmY<)1s$nY(2+_(
zPZ}!B5A)c^yA*del5+p!g7PF#VmP6oBvnDF6?BwZK}RVCBjpJk&u5<~QrrbeQpb~}
z4Wa)6QVeGmq@*fHwStZm1#e$8v!}{q3pP4{?;%O(S!7H7)hxw5l4R@t)$Fd&i@=8A
zf`W}y1)EmTv1tX}C`v&O3Uhq{N$-DZPT(Dlz-)Oljk8~uHdqCv1%t&%NrKf#sS~u6
zQsA#XX-}a;8wSu~L9GA$x<s+{lLL6`4tE1QiLhW$Jjfs+UO`69NYIgyfMl|ce#C@Z
z9M9XiLU9i!sovh{Zh)6277Uq+@gh}0r4@8kBp{WnW1z~!@p|LwTE+dDB=h{n-7pTw
zFpO1@k*Xlm3OX_pkWAJwkc~yM!d<nB`!`AU$}acN89;{NS_K&jJg?lIMRjIS9UTiD
z0a++DuBvO1W$*3^#oe4_$^Wgp0iJwVFeo0JkT6FvO4Lk2Mgo$_I)+j5AX&~cjRALh
zl4|EO?uNNQg`rU~LZm9Fw1RHDNI)uC$3WGHRNH=cJ)`Yj(jIri0>Ho^pA2iCT9U9p
zfkDj_gF^yh$T|j$R>X+@{bv6@wCDGk;+g)dzjx3pmxp>AqdGN@^m%(*5?|A6moH>?
z^cFUB0XK$qis2(w!L1c^!$$&g%Q^<`b;$j*XM3_2;M*9ufyIBY`wP9zWLkYrJUui)
zVHuzM+zi&qz0XxA{uDmg0AUjWiJGQLzNOvH(+&@c1L0m2G`sQ=_84x+yZ071JT7Wj
zFl<-!lvG7ewSumvBtTEc$~uOgZWo{E|8<zI;VYgW-oNn<X%|$c7(gS^*PnMc?1CbO
zrxm26DoC}0j+6wP6In+<X}8+zEl=Z|ytL21(>9P@_Xqd%7k~`IJ_Q-63NjS<p0#!>
zHGTnEWOW0}K4h8n0&S)Z9M8W{>ae^4AQ%oRKv3YZ>%@7HDpDQYppbwdvW@}dAcE}v
zBki9JAQN6JjkFvC5Da|TdizvaR*V5vRDh6xAhM1D<OqU{dda^>Ho)w9skFgz8elMd
zq!<-a6=+&PH%2J%ybbnLd1ygK?R{H1%SVXz`2L#yjj;hO`{mLZmahQ~!+8Z7sR}d{
z_?C@g<xm|Mr({{(0K=~vlgpD|@o#+%Ecd=r+GzO!STI~tu#l=?(F(d@A^~Sm)-jM>
z;?=LN?BDeou)cY9jw4D?g<*&=QjrkFdk)%tY2F+CY2S<X6l!jmps)!3>VZz$#TsmH
z{*&900=5{E6t<+ItxUmIreI5{(KZR!#gAU|?^F%$hhB3#hJ!l>hr*pybeAc(%M{!x
zHM%>{{lK67Zv_nQlMcEa1>lY$PvK4~y2}*YWeV<;8r}2Iea!3rU8li)_v`KmC%9wa
z)xWk|DRrVBNgVuS3VxIt{R+|Vi8uUvNrRu`FK$OA_+cnl^p;d~mnpc*6x=B_x|gGS
z>R<i4M}zy%{_1vI5AGP|Dcng#cbS5_Ou?N}qx(E`-~2b)AsU>c54jz;fis4M3TIN$
zS*GADQ*fr#=)4e}L*Bez>@iy2Y#Dkx*kD+#ut9-4YsEZMMVwrjf(@lc8}X}U@qA?2
zTTbmRFM}U{YdE_H_ckeiFLc}w-WX^LWYX?FNw^=oNEOjrrr=Gf(feNXwjR#MO=SvS
ze0PL7j9hO&oRhG&Q0&0K`C-i-vv=>|`xrhcetTlrql}4PO?aIJEQwzAhFlUZ9j53-
zEvs5`S9UCH%PnuAONy*(ik|JPt#Z{g*SM-GYwB<$#bf90cZPPgtY~jtUensXba@AU
z>}wHARhx?|D=J*Yb)L!!*$S=fXtiQlTW;~vB}-aw>R7mRiLQB!Y+f!N_7+#xSNJ?d
zYtc8k*%V%U**o}nzWbdC!>C^-UsLgh!BbUN=F&9nFpcBYn=`oeND_OLXC6s`A(?h0
zT@)IRWJ6)?5r-&jKaviG{YNrH;e#VXMB$;M(?ovl(M%BL9~~kJ>yHkH!c#}bjFi^#
zlDgDW<`QF7TUplNs?qj)EYGv1^Q2>7KkgWslpo6yg(b(5^5irO@=rtA!WH^a4HHKe
zFG%Dex%2I8e*BnSwEyB*2C%>fx&N^Hrns+wB^GM^WAWH+ElU>U7A;-c*4olP>LyqL
zQ6*0Cmc&!xDfT$ad?tVYM{3HW4D|@qOFb1jHBqWoSGjoKQ|t6K6mKQWVUP0k<Gyzk
zP^v#Z2|%0Q9o&CV*{s=9;%g~X(Wg_#?bxRW(vn1n5Wouk7w<}Z6@^8*Pm990L-1C~
zaHMtb;%gTG65h|gd;j<p@e9Za1^HqvS(7?Uu?4w#1yd&EPbru@X>xwv_`Jy=BvYNv
z70XRy#Jr8@{n`I{%xoAx`F_%{(NH0G1;k-^za(CQNo)9wWS;)P+|m8FPV0pbDh4^M
zc5ZE*tDF{cr`)>1Z4={tALjD6K8PRHC2G-9f;Mz#rMm~SPLa)d)QPGgqIzhRcsn#e
zWpTr{?gZSh{qaPFqj11V&>0hOSOiCbsNV8nS*m-$>iqQ&;h2__mAQahTv=9MUO}}X
zE)~J@036c?ZZgpb@J%PDiiR(qOb?^GN8a<z;6ZYj@YH2p#BHa5V8*HRutji)4XQf#
zW1an{GFhQYwta+$_$W1q&AnLXMNwy98|%k#oNGT$W8xQ|-waOHllG6AUEK7JumEf)
z-+wxZ|NUc&#(1Ds@%mPgup&bTX1VwDM8UHE^k8+Dt)EN~^2{@dk$K`cmVt-&-u{YL
zFtnYaBc_w#K;1~eJN~Rs6SBmD7Hho!l`6hzY!09q=qRbdk8%an4WH(xE8Pp=l3`V@
zk?%eolS*xDzIUSmtbq%2(LW6>uE6!)KgT2ncmyGu^;y1{!nL2JT*cza!trYUynobv
zeGu=$Yn;siTmy~z5Z_UJqo+Sg5Y|6_4y@-s*RlqV*OaqR=eDycns3-ZBo0Yp<2Rg*
z3Z$Wx6oe-Ci(J_zvj0u?)vmnZ=={nTvBo0=jACH_lK+*POtY(T4MKU}zs6@!{b=ng
z@_<!0&<Kr0&dhUm)iJI>y7t_7F%!GaC9BUJ=g&<Sa^?AqE1f$we(9?iU^o!;ScD#T
zJ`<1cP}^@iKOvjOC008w;->|Ha~L=SSzis<G5|2JWzSa=Lcx=77?S{JZuL1L<7-)~
zdYAo5W3$a)H$EcxsXXi7{=-@|3+9^s>x;ZxKKAc3gK1=<{6CrqIw;}m_@Qs!S2PMX
z9-`6tZ{HVF^yYt()Ke7m--00oBDUD{gBtpYMo<`WF@JEthQWYD!$B7cXo60Tj~{q~
z?z=ELg}B1$w;@;JxnO8;1&#&ZjZV-z_$Mrxzx>^Nww0$}EHsCo#+$#@7e|U8n|-xy
zSXcOGVi8a{gL_upJ)l%c(Ei{=CupB)=>+XdQ=cHNy`f8%E|IT0B79E-!_VMN;~oEd
z-yD8{_sz8P#oymDz#k4jyoIGZLIt-CLij}^Hww1Uhx?d4j4FD2LYY02a;mR|llA?7
zpca0S(_aqnyfiPY5jG4a@9&~mGS9x8O@N8!@JqaJN+R#LJaPzw3%JcJg7#0Wu?Pxl
zMC25xgdtvmOe!K%O30KekV)_(+u{K^!uKasHt`2;d(!z6KjeoCesH!^55E0D(}Rce
zSm9OD!ySVS!*B&XsYp*L(NnIVCqY9$TtV*@f2lu~HF`Tk*a+|67}J2m(0d1)*;S5x
zB>ei@hG8m?xwMA<KHN4{Wm*=(Mw6*WKh@r^LVSK~hB#iZxvmC340M~S`&yAujiW^s
zX|yO;j1~!+(JBi7_r_XSrGKJNC9q`g28&_9-nOs_X;)gNHv>9`8x#{wDxy<L=#(qa
zNzkC*5P%NL)Ej1HIXe6#Z@HBX4H*CJRyK05cr<i{v0nupz@YfeI0>t;15}YZK)Ip=
zBxpLYOx1zEg|mrb(J&jUj0nF#4}s_e;cd6EjBp<{-?KbxnC-_vh~X~95R;08lp<k1
z<qAS62vfY*^PN&{cfl#udrJgc959X{kyka2UZBMAkb;s_q@<L_k#Yqk37T<yNHvbR
zQEZKWA&67%v;g+h=&NGi1MC=fDcDIxc1nqzas@jH8unc(cGn;_+2%Xhw)4#I6TQD2
zWLU)K2Ki1RSGr(C{s}sPVZZl)jordOE{d0DuKfW3UKYbD0?e1hu%UsAaZe1(V9a}1
zNKv+T;P@C0d)p(~ErEY~Wjl;3=!saCOOJBBXJc6ePDoR#H#Uxqh_;>3JjC_7;@H%H
z`TA|#)y&t>Gk}6Y@jGx5c-}s{mC`dbU(`r3UnFSe>r~)yy<}%Kx^<T99T#snUv7-Q
z8hFP=fXDEyVzH5mi;Yr(r(6L~f(HKE0C+rO?n+=|{T&b|{J<~DoWy>1Q;`7FUaja1
z>fMqkHd62gFam@8*_rkw00~jvzC^K;qMF{kSby$J?a%$d5mqCx-Mcu6#WA~gLz0ek
zV`-B2Y!b_nr}dzusX&S$!8pt$q#~&WD{<!&cB}7W1f>ILKof$4CV3~N7{0&vrCi;(
z<^U~*p$b}3X<TKF<0^B+rCftMGzjkgRMr!1J_J_)^I!0RFZ^j~zGE_AV3?%9Ak}*+
zoejNaZQ%xdxJk7q(>%)xz>`8bUSm9(AD>4|@=i@>>1-1IEvt8FI<uI~fAOwLXKqIc
zxML_%xRdI0r?)~>yM)|j1#r)%+~{5;u6wYa!!LPT2D4OFq{nz<u)wGW3=EYD3{nFy
z<cByZG6#$qlp8TB`!PC9;T<hEwzW1F&muG51v#Qpk9HtKpxppy80IU`NDV-fA0nE}
zafB#0qRsC|^X|?RBQ&2dHl(po?<bjTpE=~RcUu+{Zy+vv|B%Iou~hGeqA32mki{w!
z#OsDBlP2aBOddbExnRQ7{K=E8Cg!b}$c8_^X$YHov!X(WDIeY=d7HDCEqb<iX?Iic
M(#7oy+gg|ZKP%GS-2eap

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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jrxml
index 46d302c4e..bd2ac2b9a 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.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="RelatorioResumoLinhas" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
 	<property name="ireport.zoom" value="3.138428376721017"/>
-	<property name="ireport.x" value="1096"/>
-	<property name="ireport.y" value="384"/>
+	<property name="ireport.x" value="432"/>
+	<property name="ireport.y" value="432"/>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
 		<box>
@@ -236,108 +236,108 @@
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
-					<text><![CDATA[                    Sub Total:]]></text>
+					<text><![CDATA[Sub Total:]]></text>
 				</staticText>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="041e4886-2c87-4687-8f2e-f2fbbe18729d" x="235" y="0" width="33" height="10"/>
+					<reportElement uuid="041e4886-2c87-4687-8f2e-f2fbbe18729d" x="288" y="0" width="41" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_TARIFA_INT}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="43aee237-4e26-4dd9-bf69-f61fbf345828" x="268" y="0" width="27" height="10"/>
+					<reportElement uuid="43aee237-4e26-4dd9-bf69-f61fbf345828" x="329" y="0" width="43" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_SEGURO_2}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="da6f1964-eb77-40bf-ba65-6f09ee4e703f" x="295" y="0" width="35" height="10"/>
+					<reportElement uuid="da6f1964-eb77-40bf-ba65-6f09ee4e703f" x="372" y="0" width="35" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_EMBARQUE_2}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="13c20f2f-6815-4c5e-a756-62a635c6129b" x="330" y="0" width="37" height="10"/>
+					<reportElement uuid="13c20f2f-6815-4c5e-a756-62a635c6129b" x="407" y="0" width="37" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_PEDAGIO_2}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="59b3f3b3-7353-406e-a096-2e1dc48b7484" x="367" y="0" width="40" height="10"/>
+					<reportElement uuid="59b3f3b3-7353-406e-a096-2e1dc48b7484" x="444" y="0" width="45" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_TOTAL_2}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="a3767a6a-79b9-4478-b3e4-b162ebd8b6c4" x="407" y="0" width="15" height="10"/>
+					<reportElement uuid="a3767a6a-79b9-4478-b3e4-b162ebd8b6c4" x="489" y="0" width="19" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{VIAGENS_2}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="f8ff7dd1-5302-477c-9218-4a1f26f0e100" x="422" y="0" width="18" height="10"/>
+					<reportElement uuid="f8ff7dd1-5302-477c-9218-4a1f26f0e100" x="508" y="0" width="29" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{VIAGENS_EXTRA_2}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="643a74d1-fc89-4246-b384-91b38e32c618" x="440" y="0" width="25" height="10"/>
+					<reportElement uuid="643a74d1-fc89-4246-b384-91b38e32c618" x="537" y="0" width="35" height="10"/>
 					<textElement textAlignment="Right">
 						<font size="5" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{VIAGENS_TOTAL_2}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="6b176547-673b-4b46-8c0c-911763d52325" x="465" y="0" width="45" height="10"/>
+					<reportElement uuid="6b176547-673b-4b46-8c0c-911763d52325" x="572" y="0" width="45" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{KM_RODADO_2}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="3bc49334-8935-4b95-8686-65b2baf249a7" x="514" y="0" width="18" height="10"/>
+					<reportElement uuid="3bc49334-8935-4b95-8686-65b2baf249a7" x="617" y="0" width="28" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{PASSAGEIROS_2}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00">
-					<reportElement uuid="0359e97f-5c6c-4265-b1de-6f8facc625e7" x="565" y="0" width="25" height="10"/>
+					<reportElement uuid="0359e97f-5c6c-4265-b1de-6f8facc625e7" x="645" y="0" width="27" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{PASSAGEIROS_MPA_2}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00">
-					<reportElement uuid="0e0b4d6d-2f9e-4d0f-a94c-904a514e59cb" x="591" y="0" width="26" height="10"/>
+					<reportElement uuid="0e0b4d6d-2f9e-4d0f-a94c-904a514e59cb" x="672" y="0" width="32" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{PASSAGEIROS_MPE_2}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00">
-					<reportElement uuid="803a40d7-383b-4a69-98a3-fe5020830ac4" x="623" y="0" width="20" height="10"/>
+					<reportElement uuid="803a40d7-383b-4a69-98a3-fe5020830ac4" x="704" y="0" width="21" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_KM_2}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="def9f63d-940e-468c-95b6-2b79cb58d60a" x="663" y="0" width="32" height="10"/>
+					<reportElement uuid="def9f63d-940e-468c-95b6-2b79cb58d60a" x="725" y="0" width="41" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_VIAGEM_2}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00">
-					<reportElement uuid="938accbf-05a4-46f2-87a2-91891f82252f" x="736" y="0" width="35" height="10"/>
+					<reportElement uuid="938accbf-05a4-46f2-87a2-91891f82252f" x="766" y="0" width="35" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
@@ -377,108 +377,108 @@
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
-					<text><![CDATA[          Total do Grupo:]]></text>
+					<text><![CDATA[Total do Grupo:]]></text>
 				</staticText>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="db1cd701-47d4-441a-ab78-f9e7aa686ad0" x="235" y="3" width="33" height="10"/>
+					<reportElement uuid="db1cd701-47d4-441a-ab78-f9e7aa686ad0" x="288" y="3" width="41" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_TARIFA_GRP}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="b0221c98-0ea2-4982-ad3d-129e4a91eb94" x="268" y="3" width="27" height="10"/>
+					<reportElement uuid="b0221c98-0ea2-4982-ad3d-129e4a91eb94" x="329" y="3" width="43" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_SEGURO_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="a5aecb48-d419-406a-b4ab-3dad24491fea" x="295" y="3" width="35" height="10"/>
+					<reportElement uuid="a5aecb48-d419-406a-b4ab-3dad24491fea" x="372" y="3" width="35" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_EMBARQUE_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="dc6ef510-1db0-4682-b6f3-13e31ef5a838" x="330" y="3" width="37" height="10"/>
+					<reportElement uuid="dc6ef510-1db0-4682-b6f3-13e31ef5a838" x="407" y="3" width="37" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_PEDAGIO_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="fb906a2d-72ab-4301-ada9-002950616b02" x="367" y="3" width="40" height="10"/>
+					<reportElement uuid="fb906a2d-72ab-4301-ada9-002950616b02" x="444" y="3" width="45" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_TOTAL_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="2e01f4b5-2734-4b58-a01f-859148abe053" x="407" y="3" width="15" height="10"/>
+					<reportElement uuid="2e01f4b5-2734-4b58-a01f-859148abe053" x="489" y="3" width="19" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{VIAGENS_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="c4065256-4776-41b7-9d17-0d7a9e8e4de9" x="422" y="3" width="18" height="10"/>
+					<reportElement uuid="c4065256-4776-41b7-9d17-0d7a9e8e4de9" x="508" y="3" width="29" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{VIAGENS_EXTRA_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="1a602ed2-d5d6-4ded-b707-c7e683b0587b" x="440" y="3" width="25" height="10"/>
+					<reportElement uuid="1a602ed2-d5d6-4ded-b707-c7e683b0587b" x="537" y="3" width="35" height="10"/>
 					<textElement textAlignment="Right">
 						<font size="5" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{VIAGENS_TOTAL_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="a63b3e4d-5cc2-44c0-8e6c-7cb541ddf940" x="465" y="3" width="45" height="10"/>
+					<reportElement uuid="a63b3e4d-5cc2-44c0-8e6c-7cb541ddf940" x="572" y="3" width="45" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{KM_RODADO_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="dede42db-eaf2-4b63-a508-c90517d2a54e" x="514" y="3" width="18" height="10"/>
+					<reportElement uuid="dede42db-eaf2-4b63-a508-c90517d2a54e" x="617" y="3" width="28" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{PASSAGEIROS_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00">
-					<reportElement uuid="c3185c7f-5a88-4ae7-b13a-c1ddd6f1ee27" x="565" y="3" width="25" height="10"/>
+					<reportElement uuid="c3185c7f-5a88-4ae7-b13a-c1ddd6f1ee27" x="645" y="3" width="27" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{PASSAGEIROS_MPA_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00">
-					<reportElement uuid="3feb9928-9ade-41a0-b31e-5e1cbbc0d735" x="591" y="3" width="26" height="10"/>
+					<reportElement uuid="3feb9928-9ade-41a0-b31e-5e1cbbc0d735" x="672" y="3" width="32" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{PASSAGEIROS_MPE_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00">
-					<reportElement uuid="a5aacae3-b107-43b0-8db3-186cd6a3f619" x="623" y="3" width="20" height="10"/>
+					<reportElement uuid="a5aacae3-b107-43b0-8db3-186cd6a3f619" x="704" y="3" width="21" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_KM_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="453574ed-a800-4690-8305-175b10dc5346" x="663" y="3" width="32" height="10"/>
+					<reportElement uuid="453574ed-a800-4690-8305-175b10dc5346" x="725" y="3" width="41" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{RECEITA_VIAGEM_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="###0.00">
-					<reportElement uuid="1d66a926-6d03-4df6-9bd4-c2c1b8bf206f" x="736" y="3" width="35" height="10"/>
+					<reportElement uuid="1d66a926-6d03-4df6-9bd4-c2c1b8bf206f" x="766" y="3" width="35" height="10"/>
 					<textElement textAlignment="Right">
 						<font isBold="true"/>
 					</textElement>
@@ -639,13 +639,13 @@
 		<band height="32" splitType="Stretch">
 			<staticText>
 				<reportElement uuid="69af5fee-1749-41a5-bf3d-e53db355ddd2" x="0" y="16" width="25" height="14"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Justified" verticalAlignment="Middle">
 					<font size="6"/>
 				</textElement>
 				<text><![CDATA[Prefixo]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="f39411fa-dfc8-4b51-a705-53b2ed781e10" mode="Transparent" x="25" y="16" width="121" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="f39411fa-dfc8-4b51-a705-53b2ed781e10" mode="Transparent" x="25" y="16" width="131" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -653,7 +653,7 @@
 				<text><![CDATA[Linha]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="9d8575a4-d773-4713-abc1-11741c586b24" mode="Transparent" x="156" y="16" width="15" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="9d8575a4-d773-4713-abc1-11741c586b24" mode="Transparent" x="156" y="16" width="40" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -661,7 +661,7 @@
 				<text><![CDATA[Lot.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="7a75fbcb-13b1-47a1-885d-e7255206654c" mode="Transparent" x="171" y="16" width="10" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="7a75fbcb-13b1-47a1-885d-e7255206654c" mode="Transparent" x="196" y="16" width="23" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -669,7 +669,7 @@
 				<text><![CDATA[Cla.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="796d78cd-ff11-4469-9dbe-7abbb92f4868" mode="Transparent" x="181" y="16" width="29" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="796d78cd-ff11-4469-9dbe-7abbb92f4868" mode="Transparent" x="219" y="16" width="29" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -677,7 +677,7 @@
 				<text><![CDATA[Extensão]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="deca7e00-7f89-4dac-ad2e-89eaeb59ba6c" mode="Transparent" x="235" y="16" width="33" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="deca7e00-7f89-4dac-ad2e-89eaeb59ba6c" mode="Transparent" x="288" y="16" width="41" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -685,7 +685,7 @@
 				<text><![CDATA[Passagens]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="78c11d55-5b14-4e0d-9a41-a921da36c477" mode="Transparent" x="268" y="16" width="27" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="78c11d55-5b14-4e0d-9a41-a921da36c477" mode="Transparent" x="329" y="16" width="43" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -693,7 +693,7 @@
 				<text><![CDATA[Seguro]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="9a3b4f6e-79aa-46a7-8edb-5b4a217301d4" mode="Transparent" x="295" y="16" width="35" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="9a3b4f6e-79aa-46a7-8edb-5b4a217301d4" mode="Transparent" x="372" y="16" width="35" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -701,7 +701,7 @@
 				<text><![CDATA[Embarque]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="037e186a-34d1-4774-be91-0f53474af75b" mode="Transparent" x="330" y="16" width="37" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="037e186a-34d1-4774-be91-0f53474af75b" mode="Transparent" x="407" y="16" width="37" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -709,7 +709,7 @@
 				<text><![CDATA[Pedagio]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="be5c09d6-13c0-4d7f-83ec-f5718fe019d2" mode="Transparent" x="367" y="16" width="40" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="be5c09d6-13c0-4d7f-83ec-f5718fe019d2" mode="Transparent" x="444" y="16" width="45" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -717,7 +717,7 @@
 				<text><![CDATA[Total]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="859a71a0-b584-489e-b099-cc127b5ea027" mode="Transparent" x="407" y="16" width="15" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="859a71a0-b584-489e-b099-cc127b5ea027" mode="Transparent" x="489" y="16" width="19" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -725,7 +725,7 @@
 				<text><![CDATA[Ord.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="b9328b6f-5e2b-4412-a2bb-f1ab50a00ae8" mode="Transparent" x="422" y="16" width="18" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="b9328b6f-5e2b-4412-a2bb-f1ab50a00ae8" mode="Transparent" x="508" y="16" width="29" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -733,7 +733,7 @@
 				<text><![CDATA[Extra]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="25946740-ff9b-4421-92c4-237b7b5c06c5" mode="Transparent" x="440" y="16" width="25" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="25946740-ff9b-4421-92c4-237b7b5c06c5" mode="Transparent" x="537" y="16" width="35" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -741,7 +741,7 @@
 				<text><![CDATA[Total]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="0c75fb19-0d9a-4b66-9e3c-4d714cae6079" mode="Transparent" x="465" y="16" width="45" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="0c75fb19-0d9a-4b66-9e3c-4d714cae6079" mode="Transparent" x="572" y="16" width="45" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -749,7 +749,7 @@
 				<text><![CDATA[Km Rodado]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="998f2194-128e-4132-b882-9188016b3d87" mode="Transparent" x="514" y="16" width="18" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="998f2194-128e-4132-b882-9188016b3d87" mode="Transparent" x="617" y="16" width="28" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -757,7 +757,7 @@
 				<text><![CDATA[Abs.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ddc8db3b-b459-4b86-9862-311f9530786b" mode="Transparent" x="565" y="16" width="25" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="ddc8db3b-b459-4b86-9862-311f9530786b" mode="Transparent" x="645" y="16" width="27" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -765,7 +765,7 @@
 				<text><![CDATA[MPA]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="d5dd65d5-24a2-454e-a516-6847f0abf648" mode="Transparent" x="591" y="16" width="26" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="d5dd65d5-24a2-454e-a516-6847f0abf648" mode="Transparent" x="672" y="16" width="32" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -773,7 +773,7 @@
 				<text><![CDATA[MPE]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="31f020bf-2be6-4f3c-98ec-6dffc692dfc6" mode="Transparent" x="623" y="16" width="20" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="31f020bf-2be6-4f3c-98ec-6dffc692dfc6" mode="Transparent" x="704" y="16" width="21" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -781,15 +781,7 @@
 				<text><![CDATA[R$/KM]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ea2e82c6-9390-4fca-9158-94f17dc4360a" mode="Transparent" x="643" y="16" width="20" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<text><![CDATA[EQ.]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="5f13dda7-5e2c-4c1a-a8cc-03cb2e0ea46b" mode="Transparent" x="663" y="16" width="32" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="5f13dda7-5e2c-4c1a-a8cc-03cb2e0ea46b" mode="Transparent" x="725" y="16" width="41" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -797,7 +789,7 @@
 				<text><![CDATA[R$/Viagem]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="50c7e602-bf62-49c7-aab5-a923ae173891" mode="Transparent" x="736" y="16" width="35" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="50c7e602-bf62-49c7-aab5-a923ae173891" mode="Transparent" x="766" y="16" width="35" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -845,31 +837,7 @@
 				</line>
 			</elementGroup>
 			<staticText>
-				<reportElement uuid="b063e934-2c41-4b8b-a5cd-a58832a9d88d" mode="Transparent" x="695" y="16" width="41" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<text><![CDATA[PAX Ofer.]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="b7a9b493-5421-4866-9584-2602313ca8b1" mode="Transparent" x="771" y="16" width="30" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<text><![CDATA[IAP%]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="3c661a39-e73a-49ee-9ecb-5a0e15c55c8b" mode="Transparent" x="532" y="16" width="33" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<text><![CDATA[Equival.]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="b83fae48-4be7-4076-a8b5-432d1e0a1991" mode="Transparent" x="210" y="16" width="25" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="b83fae48-4be7-4076-a8b5-432d1e0a1991" mode="Transparent" x="248" y="16" width="40" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -881,8 +849,8 @@
 	<detail>
 		<band height="16" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="3806ad9e-a061-446b-b913-8e5154e42c17" x="0" y="0" width="25" height="9"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
+				<reportElement uuid="3806ad9e-a061-446b-b913-8e5154e42c17" x="0" y="0" width="25" height="16"/>
+				<textElement verticalAlignment="Middle">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{PREFIXO}]]></textFieldExpression>
@@ -893,89 +861,89 @@
 				<textFieldExpression><![CDATA[$F{DESCRUTA}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="0e3f1f2d-a83f-4e9a-ba34-db10a68e9c6c" x="181" y="0" width="29" height="9"/>
+				<reportElement uuid="0e3f1f2d-a83f-4e9a-ba34-db10a68e9c6c" x="219" y="0" width="29" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{EXTENSAO_KM}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="01b843c0-fd06-4151-9cfd-a15a1d6f7afb" x="268" y="0" width="27" height="9"/>
+				<reportElement uuid="01b843c0-fd06-4151-9cfd-a15a1d6f7afb" x="329" y="0" width="43" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{RECEITA_SEGURO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="908b363d-27a9-4f48-a601-0506227e0ab4" x="295" y="0" width="35" height="9"/>
+				<reportElement uuid="908b363d-27a9-4f48-a601-0506227e0ab4" x="372" y="0" width="35" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{RECEITA_EMBARQUE}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="f223321b-454b-4b7c-aa70-698525f5ba33" x="330" y="0" width="37" height="9"/>
+				<reportElement uuid="f223321b-454b-4b7c-aa70-698525f5ba33" x="407" y="0" width="37" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{RECEITA_PEDAGIO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="f0e8fc9a-4e83-4e23-a959-85701a6a2513" x="235" y="0" width="33" height="9"/>
+				<reportElement uuid="f0e8fc9a-4e83-4e23-a959-85701a6a2513" x="288" y="0" width="41" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{RECEITA_TARIFA}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="3b54d0f0-816a-42e3-949a-ff8a764c7926" x="407" y="0" width="15" height="9"/>
+				<reportElement uuid="3b54d0f0-816a-42e3-949a-ff8a764c7926" x="489" y="0" width="19" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{VIAGENS}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e60bbc3e-0f01-4e38-9a2f-6a870199e999" x="422" y="0" width="18" height="9"/>
+				<reportElement uuid="e60bbc3e-0f01-4e38-9a2f-6a870199e999" x="508" y="0" width="29" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{VIAGENS_EXTRA}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="2f23db7f-13ce-45c7-b72a-cd019807d422" x="440" y="0" width="25" height="9"/>
+				<reportElement uuid="2f23db7f-13ce-45c7-b72a-cd019807d422" x="537" y="0" width="35" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{VIAGENS_TOTAL}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="8b73a35d-2dcb-46e6-b055-2b683b6c227c" x="367" y="0" width="40" height="9"/>
+				<reportElement uuid="8b73a35d-2dcb-46e6-b055-2b683b6c227c" x="444" y="0" width="45" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{RECEITA_TOTAL}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="f53b87cd-bf78-423c-8370-da117fbfe57e" x="465" y="0" width="45" height="9"/>
+				<reportElement uuid="f53b87cd-bf78-423c-8370-da117fbfe57e" x="572" y="0" width="45" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{KM_RODADO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="ac90046e-a510-4587-8d6a-cbf419b713f6" x="565" y="0" width="25" height="9"/>
+				<reportElement uuid="ac90046e-a510-4587-8d6a-cbf419b713f6" x="645" y="0" width="27" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{PASSAGEIROS_MPA}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="0190c870-c423-4a99-b09d-ce360b0382fa" x="591" y="0" width="26" height="9"/>
+				<reportElement uuid="0190c870-c423-4a99-b09d-ce360b0382fa" x="672" y="0" width="32" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{PASSAGEIROS_MPE}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="78d6da19-c9f8-4d7c-a2a7-edda464ebe46" x="623" y="0" width="20" height="9"/>
+				<reportElement uuid="78d6da19-c9f8-4d7c-a2a7-edda464ebe46" x="704" y="0" width="21" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{RECEITA_KM}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="8012c831-d025-4bd9-9967-a4fe6f122cd0" x="663" y="0" width="32" height="9"/>
+				<reportElement uuid="8012c831-d025-4bd9-9967-a4fe6f122cd0" x="725" y="0" width="41" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{RECEITA_VIAGEM}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="4a7aebfb-b474-4fb3-9fa6-2e90fd172058" x="736" y="0" width="35" height="9"/>
+				<reportElement uuid="4a7aebfb-b474-4fb3-9fa6-2e90fd172058" x="766" y="0" width="35" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{PAX_KM}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="b240b92a-4144-4f01-a5b9-1cdc8d25382b" x="171" y="0" width="10" height="9"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle"/>
+				<reportElement uuid="b240b92a-4144-4f01-a5b9-1cdc8d25382b" x="196" y="0" width="23" height="9"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{CVE_CLASE_SERVICIO}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="775711fe-9467-4465-b092-80ef51ead84d" x="514" y="0" width="18" height="9"/>
+				<reportElement uuid="775711fe-9467-4465-b092-80ef51ead84d" x="617" y="0" width="28" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{PASSAGEIROS}]]></textFieldExpression>
 			</textField>
@@ -988,108 +956,108 @@
 				<textElement>
 					<font isBold="true"/>
 				</textElement>
-				<text><![CDATA[                            Geral]]></text>
+				<text><![CDATA[Geral]]></text>
 			</staticText>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="3bfef22c-0a77-422c-ac1d-f4d2535b46ff" x="235" y="0" width="33" height="10"/>
+				<reportElement uuid="3bfef22c-0a77-422c-ac1d-f4d2535b46ff" x="288" y="0" width="41" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{RECEITA_TARIFA_GERAL}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="e3f91e91-6944-48d1-a237-38e52e0a8d7a" x="268" y="0" width="27" height="10"/>
+				<reportElement uuid="e3f91e91-6944-48d1-a237-38e52e0a8d7a" x="329" y="0" width="43" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{RECEITA_SEGURO_3}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="7142b0c4-f126-4565-9b85-a83dd631612e" x="295" y="0" width="35" height="10"/>
+				<reportElement uuid="7142b0c4-f126-4565-9b85-a83dd631612e" x="372" y="0" width="35" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{RECEITA_EMBARQUE_3}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="8d8798a7-a0c3-41ef-b9c8-06b40b8196e3" x="330" y="0" width="37" height="10"/>
+				<reportElement uuid="8d8798a7-a0c3-41ef-b9c8-06b40b8196e3" x="407" y="0" width="37" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{RECEITA_PEDAGIO_3}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="7cb22254-3c7c-4ed3-9c90-2a3dac05e8e0" x="367" y="0" width="40" height="10"/>
+				<reportElement uuid="7cb22254-3c7c-4ed3-9c90-2a3dac05e8e0" x="444" y="0" width="45" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{RECEITA_TOTAL_3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="7d747ce5-937c-48ee-9fdb-6f346ff4446b" x="407" y="0" width="15" height="10"/>
+				<reportElement uuid="7d747ce5-937c-48ee-9fdb-6f346ff4446b" x="489" y="0" width="19" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{VIAGENS_3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="2284552a-20c3-494b-a40c-6237001ef20b" x="422" y="0" width="18" height="10"/>
+				<reportElement uuid="2284552a-20c3-494b-a40c-6237001ef20b" x="508" y="0" width="29" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{VIAGENS_EXTRA_3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="da8315b5-044f-40eb-88d7-c75acc2fc01d" x="440" y="0" width="25" height="10"/>
+				<reportElement uuid="da8315b5-044f-40eb-88d7-c75acc2fc01d" x="537" y="0" width="35" height="10"/>
 				<textElement textAlignment="Right">
 					<font size="5" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{VIAGENS_TOTAL_3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="29a87e9a-930a-417c-b568-f7e030a447ae" x="465" y="0" width="45" height="10"/>
+				<reportElement uuid="29a87e9a-930a-417c-b568-f7e030a447ae" x="572" y="0" width="45" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{KM_RODADO_3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="11bb7940-dfb1-48a4-9855-5d189309a9a6" x="514" y="0" width="18" height="10"/>
+				<reportElement uuid="11bb7940-dfb1-48a4-9855-5d189309a9a6" x="617" y="0" width="28" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{PASSAGEIROS_3}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00">
-				<reportElement uuid="3eb6fb5d-9ebe-4d7b-8330-3fc40aaa42a8" x="565" y="0" width="25" height="10"/>
+				<reportElement uuid="3eb6fb5d-9ebe-4d7b-8330-3fc40aaa42a8" x="645" y="0" width="27" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{PASSAGEIROS_MPA_3}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00">
-				<reportElement uuid="286fdd0c-a121-4c6e-83e5-114d7307c557" x="591" y="0" width="26" height="10"/>
+				<reportElement uuid="286fdd0c-a121-4c6e-83e5-114d7307c557" x="672" y="0" width="32" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{PASSAGEIROS_MPE_3}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00">
-				<reportElement uuid="06262876-8581-45b3-abcb-73c9b8996406" x="623" y="0" width="20" height="10"/>
+				<reportElement uuid="06262876-8581-45b3-abcb-73c9b8996406" x="704" y="0" width="21" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{RECEITA_KM_3}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="30561514-bc5c-42cf-8906-89af33a0f831" x="663" y="0" width="32" height="10"/>
+				<reportElement uuid="30561514-bc5c-42cf-8906-89af33a0f831" x="725" y="0" width="41" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{RECEITA_VIAGEM_3}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00">
-				<reportElement uuid="d79c96bc-69a8-4645-be85-28ede43da0a7" x="736" y="0" width="35" height="10"/>
+				<reportElement uuid="d79c96bc-69a8-4645-be85-28ede43da0a7" x="766" y="0" width="35" height="10"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java
index f910c27cd..f7258945a 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java
@@ -163,8 +163,10 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
 		parametros.put("lsNumLinha", lsNumLinha);
 		parametros.put("lsNumServico", lsNumServico);
 		Relatorio relatorio = null;
+		String tituloRelatorio = "";
 		if(!chkSimplificado.isChecked()) {
 			relatorio = new RelatorioLinhasHorario(parametros, dataSourceRead.getConnection());
+			tituloRelatorio = "relatorioLinhasHorarioController.window.title";
 		}else {
 			if(horaInicial.getValue() != null){
 				parametros.put("HORA_INICIAL", horaInicial.getValue());
@@ -175,6 +177,7 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
 			parametros.put("ISSENTIDOIDA", chkIndSentidoIda.isChecked());
 			parametros.put("ISSENTIDOVOLTA", chkIndSentidoVolta.isChecked() );
 			relatorio = new RelatorioLinhasHorarioSimplificado(parametros, dataSourceRead.getConnection());
+			tituloRelatorio = "relatorioLinhasHorarioSimplificadoController.window.title";
 			
 		}
 
@@ -182,7 +185,7 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
 		args.put("relatorio", relatorio);
 
 		openWindow("/component/reportView.zul",
-				Labels.getLabel("relatorioLinhasHorarioController.window.title"), args, MODAL);
+				Labels.getLabel(tituloRelatorio), args, MODAL);
 
 	}
 
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java
index 5d1e25ff2..85989dbce 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java
@@ -129,13 +129,18 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer {
 		parametros.put("DATA", new Date());
 		parametros.put("FILTROS", filtro.toString());
 
+		String tituloRelatorio = "";
 		if (rdAnalitico.isChecked()) {
 			if(chcSumarizar.isChecked()) {
 				relatorio = new RelatorioResumoLinhasAnaliticoSumarizado(parametros, dataSourceRead.getConnection());
+				tituloRelatorio = "relatorioResumoLinhasAnaliticoSumarizadoCompletoController.window.title";
 			}else if(chcSimplificadoSumarizado.isChecked()){
 				relatorio = new RelatorioResumoLinhasAnaliticoSimplificadoSumarizado(parametros, dataSourceRead.getConnection());
+				tituloRelatorio = "relatorioResumoLinhasAnaliticoSumarizadoSimplificadoController.window.title";
 			}else {
 				relatorio = new RelatorioResumoLinhasAnalitico(parametros, dataSourceRead.getConnection());
+				tituloRelatorio = "relatorioResumoLinhasController.window.title";
+				
 			}
 		}else {
 			relatorio = new RelatorioResumoLinhas(parametros, dataSourceRead.getConnection());
@@ -144,7 +149,7 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer {
 		args.put("relatorio", relatorio);
 
 		openWindow("/component/reportView.zul",
-				Labels.getLabel("relatorioResumoLinhasController.window.title"), args, MODAL); 
+				Labels.getLabel(tituloRelatorio), args, MODAL); 
 
 	}
 
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 2c1b03fa2..9488e58e0 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -526,6 +526,8 @@ relatorioIRKController.window.title= Relatório Indice IRK
 
 #Resumo de linhas
 relatorioResumoLinhasController.window.title = Relatório Resumo de Linhas
+relatorioResumoLinhasAnaliticoSumarizadoCompletoController.window.title = Relatório Resumo de Linhas Analítico Sumarizado Completo
+relatorioResumoLinhasAnaliticoSumarizadoSimplificadoController.window.title = Relatório Resumo de Linhas Analítico Sumarizado Simplificado
 relatorioResumoLinhasController.lbRuta.value = Linha
 relatorioResumoLinhasController.lbFecCorrida.value = Período de Viagem
 relatorioResumoLinhasController.lbEmpresa.value = Empresa
@@ -638,7 +640,7 @@ relatorioLinhasHorarioController.lbLote.label = Lote
 relatorioLinhasHorarioController.lbLinha.label = Linha
 relatorioLinhasHorarioController.lbServico.label = Servico
 relatorioLinhasHorarioController.window.title = Relatório de Linhas por Horário
-
+relatorioLinhasHorarioSimplificadoController.window.title = Relatório de Linhas por Horário Simplificado
 relatorioLinhasHorarioController.lbNumRuta.label = Num. Linha
 relatorioLinhasHorarioController.lbPrefixo.label = Prefixo