From 1036846c9308e9dae739301a9d90c9128aa07426 Mon Sep 17 00:00:00 2001
From: "igor.rodrigo" <igor.rodrigo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 18 Sep 2015 20:29:39 +0000
Subject: [PATCH] fixes bug 6555

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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jasper
index a0ba2c7d8f2bb7a808172cd7727ea1418de31de3..72dfec989e68d2d90ed3a9563d866a1c37133418 100644
GIT binary patch
delta 3285
zcma);ZA@EL7{|{k^krSPg2jPQN`Zp3qve*Cvgsx>l`&Z+(sdLN2Ia-Y#KrQG1vNo*
zN=#IoJ26>OrsInl8iS^Ye$a$OqaRcv-;5ZuWgkp*F*28FGG{&KIk#|o?}4sKPoDOF
zdY|9(zt4GY|2VJv>%8uxS-bu<gmedzbM_&OSIL~+Md}=m+{sZCAU>mwNG3fwS5<A$
zhaYV@5+RQ}Dx7CW&?JIoGCs!Q9)!M(#OZ58I7@tG)_r^<-_xhv!-beuAXgo4=)(x%
zXMtz7JmfsbE)C0!ASYK@&Z9gO<Wve7Ic0(3LotKtLS{&;;(06qf}t|xyvPt>NeB?Q
z3J5$DASi_l1X<7^Bq)N1{8QP2uaiU0v78Sk;sp0wO{fx3=gF!wp=VfAWU(rkzr;em
z#33Z>cAN847Q%8_z|B>-T|5+UD}@Yh`Nz}M!}v0pi&{yl`kG-W9v?@DELRliJ7{Zt
z3kG^?Le3u;2rMfC5UzrOJQRQ^g$xi`&=|M^20C1=mct041btg%=ctXvX&dR+C`I4w
z&c_+#0$G*zkk4IpB}wp6wZNVwF!u_RU|AE?#8ohthk}}vLPkyUkKc0dF)l;KHEMC8
z`KvVKH{?>8jr{JeHBrYI#`mOb?|R<#R4R1`KIgG7Z;<@9V)8((+rS%xwAVPCe=`M^
zn*wUC!kyrufLbYJP|E^^%sfpu;ZE%LG!-;cr)MeTziP<$Joa6;cquaLs>g9Km$G75
zbXry}<Z_`~F-c^Bj0CI(eg%U4*86zK9L%7@I-tAc_25s)ir2AIVtmR@xxqhd(J2S&
zT%{T0%wN?(EO`ju%SwSIPf!Y11*LESN|8faia`!H+5_jQ+vDA!jhvF)*g~#!m68R?
zTma{hmX=am|EnajzKZd}QYql&s(_aZz$=H$dU?CX`bx0=s&5GMR_(7Bq4*gJEIt7W
zR|P0s02Dc7DDrj<iVsk_{gHwb^x^ZPs7HVH+w*UMdoOO@V?z6M=fjK;mL}2^ID?z$
z#cbsLU_QAP@X~u=uCK8ip_iSam%TH_emu`+c`@3)wO(&<m1`1irUn!?ib}|O!!#ch
z_?Wg6S~x)gd)Pln3I0=ez`;g=?a5agZ(B?{pENNxifZZqf%}smw_Grqc&}qivc2sc
zj9DGU*7+^YhQFOpQEb_yhDd>ap?w-Jld^EBdb$mS>o%v`NTkT(Wm)Je{Q%r9bI$Pq
z%<t_opFS>|rh7?k8k??-k$PqR>MXUcMY7j==tMf>+oFu-4!<&E5$WyNoh9o+NA|1*
zQRZ+Ws&V+2s0S~>fOsKdw)m;FFW;rTuXJWl`&%bVJJO{|yV$iC(oPr=J4m!U+uO>M
zQ{AR)?eyIf*|Yk3(iZ<DviNpS1I_L0UCiRE>!jBv({0_lGbhuz{uJfv?0arU`tckm
z%e{pbJwiD)YH{(#4A}bYJkl>Yr^b;X)cjbaISf8+O_J=FNpj3;l2|OPq8Orc;0sFO
zz6*+~0YCRaexz+8D30)(1L^Dzb#``;x(1^gZJqpVkWP)SlhNT;U15Dt+9w4A`x~Xc
zdKv`%Muah)H6wZ(**$7ZuAMqoevf9;ILSY1Cm%k!V^?eJOl&ap%<1@3PY;j&50T+H
AK>z>%

delta 3081
zcmah~ZD^ZS6n<}{O<g~-kTAD2O_Mfjo3#0O(<IH%SxTw>06&&xZPs?}+B%Cr2I)Fv
zpp+pprgJ)bM2b_fKUVy)!A9axVe_N<Ls|s?2xB0F{SrmH*`c7b-h1v%^S;S#-$D-O
zzUTHn&w0+d=l(fw`hDJX^#fPg+lpd}WEWk}6R@`UA>?*LRYRlq^o%m6pqb0eGJjN2
zmQxw}w;4DMYQ3$TZ-j{^TRnIA_6gZ`&-pTX40#b2T|W5D)9pRa4nuQJg2JPSB3z0R
z;jRQl1Smx$Je4PV4z4x4OdJS0*x2oTpMj!Tkbv?if(n;`a#sQ>0wtge6f^*R-d?f-
z7re8Nd~zxSGlRAYr4h+3foJbUc+Ncl%X_2N9Am@{%A13GE~ocX_7%+~2~QqHp2B4%
z;I4$H*aJ<+$R+Sh*`TWVF3G`Kb6wd8?SN%e=kb<q?+*+W&8h^IM-f%HOdak@P(`3b
zomEsP;2W?+6h&E}KZ}rsYUIdkL_aGV^v4Q`x?BdeZ5Mp+3)NmLC|2+^+WpMFqPZo>
zf=4k6;WF*GE6GCa89%(sd=oKlQ3W5{@lBrAcVP87;ctIiMUL}afwtCrJ6AR~HXh>s
zos7*Icv>9L+vYFll?F?L+xvh;(A<~s<Wb})T&6a6B|Jrd($Zgm`>6I)flj+h)jUgS
z{aZ{c8*o*xbMk^+z3Q$sQFa840wiur@HIbuSaZSo9up6Ymj-}@ZF|H&7qcS@vbz!t
zkSyE|x+@)wpSBy;_+pE0=nwhobj+EeMR%#Tir82xXlgJOzLun-4d_zg0hUU+a5o!*
z)D$<wO4JD_!+uf?)^r^l_wBIbEu*Pz6idGzmPy~p_@eP3U%r;`)dqBYc>tvsdrGAD
zz}M<Kgg55#h>V8HXrKup4ZfDp&<1ogcmQdLJtZ_k*a6e+DSHon9d66|^Ots)V?8s+
zYJ2shQkLxR?MtzRrdhifRW$n<RX7{1g30I**-uY*!cWmoT8v-gEtWotk)aq5XW0Qu
zY$`jH?R)G(%;#BWbt9bx(1M2*Wiz`L9>mU&oA64!PCFe~Gkh6u<@k2?;Hnh=zv4#d
z>X1|*`)0>K7BdN-nmwVkfog8fUhiEnSMZLfCoa0(*_WQ3BZMX5uq|zIOA-h8%p}zX
z+URMxe|X>wpKqp2aXYj5Hk}L==9@dc8?Gm73{Wc$MsZSahkD{*9`#ij>JzDm9`&u1
z5$c_kajrdwSe;f6>FUI?v<$Xu@tl=Gs%ZYr-cI4%pfT#6A%^<#PzmbYp#Xi1t?8J7
zpl_s&LH<bR1^q%M=;w!95vmSM!y{&FXwgQm4L@qsMn8@i<Htu?k~c<+lbk;iqrmYa
zIfER7V?n2&wRNw;SUyQQz4UK!*Z6yd3Vt=Q8~z$M>X`ncVJ{sk<=s8cq<WGRb-RZB
z>?q5xb3&Kj3lm8#Xp=#X{>gTpqZnX?L^b#E-AM*iJEa3+Jvufuv<a5IG4&B4-)2XT
p4Vdg<HQv$DzAqNrH=a-vu|(Xg5D3jQW$#Qs?Xi|b;mOxy{{wM8>@ENR

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoVendaCartao.jrxml
index 9601ce30f..a4c26258f 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="0"/>
+	<property name="ireport.x" value="10"/>
 	<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"/>
@@ -134,35 +134,35 @@
 				<textFieldExpression><![CDATA[$R{label.Estabelecimento}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="0ddedacd-7ebc-4aa7-9535-2f5695ee9c8c" x="562" y="15" width="143" height="21"/>
+				<reportElement uuid="0ddedacd-7ebc-4aa7-9535-2f5695ee9c8c" x="572" y="15" width="139" height="21"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.motivo}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="8506ac47-d72f-4ef5-b53a-da3970fb7edc" x="459" y="15" width="92" height="21"/>
-				<textElement>
+				<reportElement uuid="8506ac47-d72f-4ef5-b53a-da3970fb7edc" x="465" y="15" width="92" 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="361" y="15" width="92" height="21"/>
+				<reportElement uuid="859d4892-377e-4313-8a88-6454a88ce936" x="377" y="15" width="82" height="21"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.valor.venda}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="d9a2225c-8883-4a35-9c16-8af9bcfe6577" x="282" y="15" width="80" height="21"/>
+				<reportElement uuid="d9a2225c-8883-4a35-9c16-8af9bcfe6577" x="304" 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="203" y="15" width="79" height="21" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="0583701e-920a-473b-b1e4-6137f8d022df" mode="Transparent" x="236" 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"/>
@@ -170,14 +170,14 @@
 				<textFieldExpression><![CDATA[$R{label.cartao}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="82e75550-fae7-4cea-acf9-f9f56f083400" x="707" y="15" width="91" height="21"/>
+				<reportElement uuid="82e75550-fae7-4cea-acf9-f9f56f083400" x="715" y="15" width="86" height="21"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.autorizacao}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="f9ea7239-48e1-4207-b957-dc4aadcaa590" mode="Transparent" x="152" y="15" width="50" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
+				<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">
 					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -189,21 +189,21 @@
 	<detail>
 		<band height="28" splitType="Stretch">
 			<textField>
-				<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" x="203" y="-3" width="79" height="20"/>
+				<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" x="236" 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="136" y="-4" width="49" height="20"/>
+				<reportElement uuid="73582b2a-b21b-4637-990c-aff7423a8e27" x="156" y="-4" width="69" 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="282" y="-4" width="80" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3" mode="Transparent" x="304" 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"/>
@@ -211,7 +211,7 @@
 				<textFieldExpression><![CDATA[$F{datavenda}]]></textFieldExpression>
 			</textField>
 			<textField pattern="¤ #,##0.00">
-				<reportElement uuid="49faea3b-2ce4-469a-b07c-3b4869aaa9e5" x="707" y="-1" width="91" height="20"/>
+				<reportElement uuid="49faea3b-2ce4-469a-b07c-3b4869aaa9e5" x="715" y="-1" width="86" height="20"/>
 				<textElement>
 					<font size="11" isBold="false" isItalic="false"/>
 				</textElement>
@@ -225,14 +225,14 @@
 				<textFieldExpression><![CDATA[$F{estabelecimento}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="48c368c2-dd11-4724-a5e9-b3f139464d4a" x="475" y="-4" width="69" height="20"/>
+				<reportElement uuid="48c368c2-dd11-4724-a5e9-b3f139464d4a" x="472" y="-4" width="85" 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="368" y="-3" width="72" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="22208383-347b-421f-9528-08d231f9acd3" mode="Transparent" x="384" y="-3" width="72" 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="561" y="-2" width="143" height="20"/>
+				<reportElement uuid="a40b0fab-d6bd-4673-a150-d85c0c576816" x="571" y="-2" width="139" height="20"/>
 				<textElement>
 					<font size="11" isBold="false" isItalic="false"/>
 				</textElement>