From 162ac953cced4e0543cc443f3c1b1f9e0e3d58b4 Mon Sep 17 00:00:00 2001
From: "igor.rodrigo" <igor.rodrigo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 23 Sep 2015 11:51:21 +0000
Subject: [PATCH] fixes bug 6555

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@48103 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../RelatorioCancelamentoVendaCartao.jasper   | Bin 35187 -> 35186 bytes
 .../RelatorioCancelamentoVendaCartao.jrxml    |  34 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jasper
index 72dfec989e68d2d90ed3a9563d866a1c37133418..96e311bc9f82ababe96b029120c42e1bca30b948 100644
GIT binary patch
delta 290
zcmex7iRsfMrVZ1?S(h>}FfdJCD5tski1-aQ)}26}<>rNQ35=|D3=E8`!7};^{fw+>
zKyEaMJNb>G0&5{d9Yf>f1qw=&^_BiIs)Ch;DO)l!KHNM(<v9zdKhW4FAm*R!7$G@%
zre-u_!Q=y`rknM&-h<T0>7+BV`T^yeCm%4@+`L)WgOOGB|NsAgz{(R$4K{n~e`8`?
zy4k^~nvt~}X!XX;2aM|&Ib(p#RG`AYAcdO~OgA%fP6s;K0x0xv@_7T*&5q`70_=<i
z6~#piI+G3A)i-Z*{~#}7Y+ztvW@Kt=XcTX3Zf<B~%+A0#S-((i^MiC>MFDi#$+n$l
E026>-Gynhq

delta 272
zcmew~iRtqsrVZ1?S*J5FFfdJCD5tski1-aQ)@~rrX7fV11V+{v1_s89U>SXden!?H
zAh#04o%}{oVRF2N@?>MBzl;W(4V9A^8Q*N4qVk-D)eUIa?8yz96|98}bqt#)A22oD
ztf%!JBrm6v&dBNtl%F&CfU)N0&AJ|pK+S*joS7M?Z+0-MW@HToT5x0Y0pmJGP7ffn
z;s5{te<$gCZk}M;%*Y9Hmo-r2-{kWKs+%3n-2^z83=JxZix_k!8?vi!-s=8AUc|`E
qz{0@H#M0a#-U!GrGiGOCoUB)<w)uX#uOg;w34;+(ugv6_PB8#AS5`&<

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml
index a4c26258f..37f28fb1a 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.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="RelatorioCancelamentoVendaCartao" 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="10"/>
+	<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"/>
@@ -127,42 +127,42 @@
 				<reportElement uuid="a11636cc-5ee1-44cc-8cd1-cbe2ebc47abb" x="1" y="34" width="802" height="1"/>
 			</line>
 			<textField>
-				<reportElement uuid="337f441e-ca7f-402c-8407-f3406ec2b4b0" x="2" y="15" width="151" height="21"/>
+				<reportElement uuid="337f441e-ca7f-402c-8407-f3406ec2b4b0" x="2" y="15" width="165" height="21"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.Estabelecimento}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="0ddedacd-7ebc-4aa7-9535-2f5695ee9c8c" x="572" y="15" width="139" height="21"/>
+				<reportElement uuid="0ddedacd-7ebc-4aa7-9535-2f5695ee9c8c" x="569" y="15" width="185" height="21"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.motivo}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="8506ac47-d72f-4ef5-b53a-da3970fb7edc" x="465" y="15" width="92" height="21"/>
+				<reportElement uuid="8506ac47-d72f-4ef5-b53a-da3970fb7edc" x="427" y="15" width="126" height="21"/>
 				<textElement textAlignment="Right">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.valor.cancelar}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="859d4892-377e-4313-8a88-6454a88ce936" x="377" y="15" width="82" height="21"/>
-				<textElement>
+				<reportElement uuid="859d4892-377e-4313-8a88-6454a88ce936" x="347" y="15" width="102" height="21"/>
+				<textElement textAlignment="Right">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.valor.venda}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="d9a2225c-8883-4a35-9c16-8af9bcfe6577" x="304" y="15" width="80" height="21"/>
+				<reportElement uuid="d9a2225c-8883-4a35-9c16-8af9bcfe6577" x="293" y="15" width="80" height="21"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.data}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="0583701e-920a-473b-b1e4-6137f8d022df" mode="Transparent" x="236" y="15" width="79" height="21" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="0583701e-920a-473b-b1e4-6137f8d022df" mode="Transparent" x="225" y="15" width="79" height="21" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -177,8 +177,8 @@
 				<textFieldExpression><![CDATA[$R{label.autorizacao}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="f9ea7239-48e1-4207-b957-dc4aadcaa590" mode="Transparent" x="155" y="15" width="70" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+				<reportElement uuid="f9ea7239-48e1-4207-b957-dc4aadcaa590" mode="Transparent" x="130" y="15" width="79" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
@@ -189,21 +189,21 @@
 	<detail>
 		<band height="28" splitType="Stretch">
 			<textField>
-				<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" x="236" y="-3" width="79" height="20"/>
+				<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" x="225" y="-3" width="79" height="20"/>
 				<textElement>
 					<font size="11" isBold="false" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cartao}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="73582b2a-b21b-4637-990c-aff7423a8e27" x="156" y="-4" width="69" height="20"/>
+				<reportElement uuid="73582b2a-b21b-4637-990c-aff7423a8e27" x="131" y="-4" width="78" height="20"/>
 				<textElement>
 					<font size="11" isBold="false" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{numerositef}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3" mode="Transparent" x="304" y="-4" width="80" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3" mode="Transparent" x="293" y="-4" width="80" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="11" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -218,21 +218,21 @@
 				<textFieldExpression><![CDATA[$F{autorizacao}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa" x="2" y="-3" width="151" height="20"/>
+				<reportElement uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa" x="2" y="-3" width="165" height="20"/>
 				<textElement>
 					<font size="11" isBold="false" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{estabelecimento}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="48c368c2-dd11-4724-a5e9-b3f139464d4a" x="472" y="-4" width="85" height="20"/>
+				<reportElement uuid="48c368c2-dd11-4724-a5e9-b3f139464d4a" x="433" y="-4" width="119" height="20"/>
 				<textElement textAlignment="Right">
 					<font size="11" isBold="false" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valorcancelar}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="22208383-347b-421f-9528-08d231f9acd3" mode="Transparent" x="384" y="-3" width="72" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="22208383-347b-421f-9528-08d231f9acd3" mode="Transparent" x="357" y="-3" width="92" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="11" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -240,7 +240,7 @@
 				<textFieldExpression><![CDATA[$F{valorvenda}]]></textFieldExpression>
 			</textField>
 			<textField pattern="¤ #,##0.00">
-				<reportElement uuid="a40b0fab-d6bd-4673-a150-d85c0c576816" x="571" y="-2" width="139" height="20"/>
+				<reportElement uuid="a40b0fab-d6bd-4673-a150-d85c0c576816" x="568" y="-2" width="151" height="20"/>
 				<textElement>
 					<font size="11" isBold="false" isItalic="false"/>
 				</textElement>