From d17234225001d68af5a7aaed69499419a4a7d6dc Mon Sep 17 00:00:00 2001
From: frederico <frederico@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 26 Apr 2016 18:17:15 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7360=20-=20corre=C3=A7=C3=A3o=20?=
 =?UTF-8?q?data=20formato=20errado=20Relat=C3=B3rio=20Receita=20Servi?=
 =?UTF-8?q?=C3=A7o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@55283 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../templates/RelatorioReceitaServico.jasper  | Bin 46135 -> 46143 bytes
 .../templates/RelatorioReceitaServico.jrxml   |  14 +++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper
index e00ce1836f3ca3c57df227892f394a2a9aabe6c4..6f4db5a41b3fc6f390bfc5b78601f444540a6737 100644
GIT binary patch
delta 1334
zcmZwHO=uHA6bJB`rD=$RAGip$)?yG8rPbZUY*P>`-9j}shk{`1S5ac{Vj7cZ{iva?
z>6aD{eGrNw1VIqIC@ZKZ1<#@vuL_FLt6mjx=e@D)vb%@Jd;6c6-wuSlTGigJYR^}O
zVuix~eBOOD)V5XMZ0<{$hW|;ylQX?>Zd|KYSPz)--L7_a&nDhnF6Z6rC5Q7t_s`^K
z9vftgwdBj4mA_hIk}=Ko-Y_sqN8Rd`T6^p=t1}yZ-aIIhUfYJH3(R@Fon{!F)??TL
zPwP8qL9$$x`^Fi2f4uBHYde$h?namUdRlOvg40tSu)UOkAGfANRxZJk!NX~mhaaPs
zPCVg1(H{gT6?iay#;O0Gka54%<D4IX7gp!;j4ehaiY13A&4^MPf%=00s)7)jgVEt$
z_%%~NcN<i09}*`ejAaaAnh~Zp0`><1SOp<?4B-jq0$musIs@XOgs~J6rWs*sBVd0J
zfK?EJiwJ+Xb6&x@#(=mgVJtO-X-1gZ2-qJ4U=@Vm8p7GxqJrPd+M*$0EDpjnOSqfb
z2p9u6cS-N0oefW-Wothr2kLV<#eAQ$#eK<OSwe<pydSj@j6Vq6PX!@#37*amD|Fq0
zEmkCorHLrbh*BGY`hx(ff)Lt-j|(FTwH9shSfW^3h|-KGwGpU42%stmp)L3K;sd_L
zGOhjtnRK6N^-ZLWtdX_ijKksPF89;D{*CG%aKpoI9eQ|W4U#?G@a%2^_P$*I58Mr>
AZU6uP

delta 1185
zcmZwHO=}ZT6b9hA`DiRxsC1y%RusFDVr!B{Cl$37QYcy@__0Y#EtY7gh@`DS@gu~f
z8LLuM&Z1Ru5&QvGrr@%OxO3w|+`G{J1zkw*eb1eO%w%ym@0>I9%-lsbw;~_6BI|2o
z@q9j6EP8LpV%@Q5`bdg4rU%=j>EYDf#RY4C(uqS}$Cds)!lkP>^PYRFF5(%>vMwP`
zmX|obKuj(Ci->}ktbA#s!#CPRg8tk;Df{NFY7Au`r5pAE&gDgQ**b4opD&lyZ)c~E
zT2;G^cc@j{X_NE4-sXedLS*Rc!!>za-+<!ap`1e=$^$&qZ)<k9SywP#W6FO8$NN=H
z2yuo!I6bthmXmqypiIEw9OCc*j^8TBtOuM4x-dRSe``fhy>#!<h@8?CN&yt-5Q+z&
z{8mwBJwO#emFm~bSN*P!$~jG;lt6I~p?ILFI9hsn!tUWa=k%HVe|jZQ-y5@ry0|nd
z?`R680*Z48#RE`iNt{xYSr1SZP^X*M4fUy+lTA&bG(d3<p?H7;^jmd+W<5YP$aT*u
z=9@b$pKAhT1qA01f(Ib{RuN`BK&;UE<8kvPoy$4-N;4>{U^s^`JOJajiZSZ}W|e*{
zpEJzJlbn2~8I%?n&LIpB!1%3V%zA)ndC{k@MQ3I>lXZ?|hq8_{<7AFHLs{?rv)K;w
Vhtu`u=UzLwa+?kg?5F;Xu5A^TeD44N

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml
index d815b7402..c7e5c0648 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioReceitaServico" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
-	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="180"/>
+	<property name="ireport.zoom" value="1.2100000000000002"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="pageHeader"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/>
@@ -63,7 +63,7 @@
 				<textFieldExpression><![CDATA[$R{cabecalho.periodo}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="8948c0fc-e878-45e2-8505-7934add98ab9" mode="Transparent" x="134" y="35" width="10" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="8948c0fc-e878-45e2-8505-7934add98ab9" mode="Transparent" x="150" y="35" width="10" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -71,7 +71,7 @@
 				<textFieldExpression><![CDATA[$R{cabecalho.periodoA}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
-				<reportElement uuid="7f1b9715-baaf-4e20-9a9d-a7ec4c696587" mode="Transparent" x="83" y="35" width="51" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="7f1b9715-baaf-4e20-9a9d-a7ec4c696587" mode="Transparent" x="83" y="35" width="66" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -79,7 +79,7 @@
 				<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
-				<reportElement uuid="64632058-9466-479c-ae28-0a11c9ed2c7f" mode="Transparent" x="144" y="35" width="51" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="64632058-9466-479c-ae28-0a11c9ed2c7f" mode="Transparent" x="160" y="35" width="66" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -94,7 +94,7 @@
 				<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
-				<reportElement uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9" mode="Transparent" x="691" y="0" width="89" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9" mode="Transparent" x="691" y="0" width="111" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -357,7 +357,7 @@
 				<textElement>
 					<font size="7" isItalic="false"/>
 				</textElement>
-				<textFieldExpression><![CDATA[new SimpleDateFormat("MM/dd/yyyy").format($F{dataHoraCompra})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[new SimpleDateFormat("dd/MM/yyyy").format($F{dataHoraCompra})]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="8e67c346-5c72-4a92-beee-9dd9ad647bb1" x="678" y="0" width="57" height="20"/>