From 87a0e217c0427e558635563ca321592c54328076 Mon Sep 17 00:00:00 2001
From: marcus <marcus@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 15 Oct 2013 18:20:09 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@31513
 d1611594-4594-4d17-8e1d-87c2c4800839

---
 .../templates/RelatorioResumoLinhas.jasper    | Bin 115366 -> 115375 bytes
 .../templates/RelatorioResumoLinhas.jrxml     |   6 +++---
 .../RelatorioResumoLinhasAnalitico.jasper     | Bin 45265 -> 45273 bytes
 .../RelatorioResumoLinhasAnalitico.jrxml      |  20 +++++++++---------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper
index 3b5b32b7e2efd8fa8480265aa63f1c4b14e5d87e..8e07a0c3bf9ecca2463c2f01d91b8c521b6dd02b 100644
GIT binary patch
delta 784
zcmZ41%D%ppeZ$Hx5@v>l40RmKN*I`p^o&5v<v^yHq2=a-Um7?V?@fQm$0)fu`fnze
zh+mkGhI6o<bC|2Mk7KZ_j)J<n=JxaKj9<JZEDSA7OpQUvINr>}+|bOJoq>^&L1%Iy
ztITwRC`R_}|AHCUGRwP0gt+<zJNn0a`!X^Jre&t)q{Ig}1_wL3yLtxs2X8+W&KSWc
zDgu!Ra&>m~3~`JPc6AR8@}KSy$tW>hDUwlPdwwM2a()>kvp5(}Ffwo>8)THpD95PE
zhiU`|<10o6UYJ;je~6<G2jiRRep!q%+b3o*{!@^BwvDOt08_W`a#m5TEer@AJBYV^
zO*f-4qx%t<8s?)wQ3P*03U4Kl_X@6ZHVUs7#M`dc%c#S}e+Z_AsT(NzY<l8!##(;3
zp^X2*O5aXr+`$HN+yfNHL3t3z9hwJq97Gi6I4BS5I4BS5I4BS5I4BR|IGY7f$3aA)
zjw@dUaU4Vt>Nw`rP{+|T<Wd;7Z`;Cnf`h2=n+^=WzU|BRG45a%!c3{t3lA}x0swN)
BB8>n5

delta 748
zcmZ4A%D$|XeZ$Hx5~e1F40RmKN*I`p^o&5v<v^x|p~dEdUm7?VuTBr-W0c+;`!}77
z+c{XzIn34B$1&J-`we!+FWy4tmL^7KMixev=9ckhM&>34Cfn}?GhSn!ej=QaS4c1|
zGc_kA-Zdh`)i2o5Ki=DS`{i)P2u5~Uh{R;Y`{L6bA{iwZMW#;(XB6397Rk7hUnamY
zIM~tM)icOHn1k^IBLg?G0oIv}a*Wd(vKXaQUokT92Dv)BdWJa0hxms$`fxD5VPxQg
z2?e{lhX(mCpOM9=DEn#~Q|AGuZr|msqFP%R5IlAeZ~McIjK+-ahhS=$j{-#zyzMBw
zl|bGzxXRfmyj~D*yM8aD4j2Csm>Q;Tpy;dVS<@M7`Qe5#{s$}lHl1+?8_01FP#g#4
zK^%8_9@KFVQJCYPJgDQKJgDQKJgDQKJc#357eE~c5rsOgVHL!25J9NpcveFlN6(N;
oVcfod3*!k6qQY-FF#P(qZ`jAUgIO3eC6-Lym?SrS<{?Hg0ASf1r2qf`

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml
index ca979c6da..72d53c258 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.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="2.2"/>
-	<property name="ireport.x" value="818"/>
-	<property name="ireport.y" value="54"/>
+	<property name="ireport.x" value="619"/>
+	<property name="ireport.y" value="61"/>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
 		<box>
@@ -123,7 +123,7 @@
                                ELSE
                                 NULL
                              END) VIAGENS,
-                       CS.CVECLASE CVE_CLASE_SERVICIO
+                       NVL(CS.CVECLASE, '') CVE_CLASE_SERVICIO
                   FROM RUTA             RT,
                        BOLETO           BL,
                        CORRIDA          CR,
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper
index 084159153e55ba8f78b677b928f9c0c6a1a72cfd..635b69a2987898d0cbe9bd154e2d0cf45e776acd 100644
GIT binary patch
delta 214
zcmcckkm=?_rVZU{j5eEl)EXF>Ih1uK^J&OUULeoH_-eDEh5<7tm$HtsvVop~!RB=B
zbAmvHX14x}TtI~o(Spfxw&I+23=9mffS6(OhCIp5$L)F<k@Q75bg^^V03{a!F+WJf
z<bF?s&1N3vjBt%$;m!S?PwXWu3@uEIEzJ!LjEv$9EiDaA&Dj|k85wjY7qZGs{@=^K
Wd0ponHDOFuC6gP?<R<UlAO-+GsX7b*

delta 158
zcmcclkm=$>rVZU{j0T%~)EXF>*p(;qYsj%0FfcG&+iav^z|6+3tgLLHw>ew;oFGt<
zm90NmQI8!=(R#a8j4(w>4qfa(MQ`0Z7$HVX{^;(z`MBp6dqHzcGfP7QBU3XIqj*b8
cBSVYLJ)Laoq8P&FB@9NB4cTQTAKoAa00U7hc>n+a

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml
index 208ad7fb1..c7a3d2aa8 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml
@@ -172,7 +172,7 @@
 					</graphicElement>
 				</line>
 				<staticText>
-					<reportElement uuid="7b817589-f754-49f1-bf53-856be52946fb" mode="Transparent" x="161" y="15" width="48" height="11" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="7b817589-f754-49f1-bf53-856be52946fb" mode="Transparent" x="161" y="15" width="60" height="11" forecolor="#000000" backcolor="#FFFFFF"/>
 					<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
 						<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 						<paragraph lineSpacing="Single"/>
@@ -180,7 +180,7 @@
 					<text><![CDATA[KM Rodados]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="4e931a04-04b4-41b7-90c2-e66083daf0fe" mode="Transparent" x="214" y="15" width="48" height="11" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="4e931a04-04b4-41b7-90c2-e66083daf0fe" mode="Transparent" x="234" y="15" width="62" height="11" forecolor="#000000" backcolor="#FFFFFF"/>
 					<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
 						<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 						<paragraph lineSpacing="Single"/>
@@ -211,15 +211,15 @@
 						<pen lineWidth="0.5"/>
 					</graphicElement>
 				</line>
-				<textField pattern="###0.00">
-					<reportElement uuid="3a2d351f-134e-43d6-acea-e3556fc61897" x="161" y="0" width="48" height="13"/>
+				<textField pattern="#,##0.00">
+					<reportElement uuid="3a2d351f-134e-43d6-acea-e3556fc61897" x="161" y="0" width="60" height="13"/>
 					<textElement textAlignment="Right">
 						<font size="8"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{EXTENSAO_1}]]></textFieldExpression>
 				</textField>
-				<textField pattern="###0.00" isBlankWhenNull="false">
-					<reportElement uuid="7fc513ea-f587-433c-88fa-6357bdb9ed55" mode="Transparent" x="214" y="0" width="48" height="13" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textField pattern="#,##0.0000" isBlankWhenNull="false">
+					<reportElement uuid="7fc513ea-f587-433c-88fa-6357bdb9ed55" mode="Transparent" x="234" y="0" width="62" height="13" forecolor="#000000" backcolor="#FFFFFF"/>
 					<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
 						<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 						<paragraph lineSpacing="Single"/>
@@ -364,15 +364,15 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{VIAGENS}]]></textFieldExpression>
 			</textField>
-			<textField pattern="###0.00">
-				<reportElement uuid="21f73b7d-c377-4047-9960-41e085463aa0" x="161" y="0" width="48" height="12"/>
+			<textField pattern="#,##0.00">
+				<reportElement uuid="21f73b7d-c377-4047-9960-41e085463aa0" x="161" y="0" width="60" height="12"/>
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{VIAGENS}.multiply($F{EXTENSAO_KM})]]></textFieldExpression>
 			</textField>
-			<textField pattern="###0.00" isBlankWhenNull="false">
-				<reportElement uuid="beb097c0-f4c1-4fe3-a62e-badfdf823c0c" mode="Transparent" x="214" y="0" width="48" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
+			<textField pattern="#,##0.0000" isBlankWhenNull="false">
+				<reportElement uuid="beb097c0-f4c1-4fe3-a62e-badfdf823c0c" mode="Transparent" x="234" y="0" width="62" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>