From bce31d06da026f218cb8e72e4dd7a05fbe0a8440 Mon Sep 17 00:00:00 2001
From: valdevir <valdevir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 5 Nov 2020 20:11:59 +0000
Subject: [PATCH] =?UTF-8?q?fixes=20bug#20183=20qua:=20dev:Valdir=20Altera?=
 =?UTF-8?q?=C3=A7=C3=A3o=20melhorias=20no=20relat=C3=B3rio=20BPE.?=
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@104165 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/templates/RelatorioBPe.jasper  | Bin 50063 -> 50063 bytes
 .../relatorios/templates/RelatorioBPe.jrxml   |  58 +++++++++---------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper
index 2d12ab24a14cb52b09493b3c51cf60892c368733..54418aa360ff52f568e7dc42115d676d4aa7ba73 100644
GIT binary patch
delta 757
zcmZ{gO=}ZT6o&6<3{7bhO-vdUtWr#EKATCCv^52ZfmmyeY0U>+h)nGeqDg0*NkT0)
zRa|5t67{%nC1?;u1zSc0MX*p@xUdM*bzS%a#DCzOnJAXxEH3YPpL^bW&NLf_X2Y<W
z>4yUtXWVkV|02K@O&X7-0KW`~_}QhPW$-n|jw^WAeFCObjKAEc@x!2k-QH(7>QV5v
zFA6_3^20ZYZ@gRdZV#FR9^*J69kNEaz*!9VzhiT#g{uJtjZ6&eln59KDtN@ziFZOR
zTw@f3@L_!Ha~jix?Ag?M>#ijFhqv(2fK%=Zmuz(4CubP>V^RV-kt*4Vm&W#EY8g*W
zsjH~+)A=!=!>Q6UO<lVtU(7@Sli6j=XErd#n=vsn)P9iOM0+NYo4rQr9omr>B&tb@
zkd2H$zrSEs2NVAT)4Ku2FYG_4N2^g<aQ07V9)k%#ia9$T$~xp%xuDe$84k<a1(%hs
zz*OC`|9TbLd#dHPrF%|GG!h*NkB(f5ghIp2sJ!st<UX6F#LjW00528`TsfUHfq<J&
zd&fl}-8zvtvB;UA0>rEv^PE&EF7PI(0kP^<jV<vaU#*C|WP(LJ+UoT#0kQo91#X@#
z6lv29AU(RjP%WQI)8sm`ExY+9kS^Wl=OkHb#VwA;I|!{q_}p`{=y^+SX;lnY)*bTp
w8q=xbhdVH>bUgN6$Gf}bmG!S3dw2ea3c}SsT)y9Bo@8t6<pf_AiX~3`4PI#df&c&j

delta 781
zcmZ{g%}*0i6vf|dZQ3F&7A=h?)QDF40j1Lpm5Rmy1`rj&wiBW;I>4l9Y&&(PC5Qs*
zhJ_2z>&MbyLo}NBkue4n5{R%hF&Wp58<)n7e}Hdh&_IZ@n4EKdbI*Hs=I6}wbLMxc
zCUD|HV?dc{x&m-bmzE=gVA{2zY5W=O#SPy#w6Y$26F7iLpM<BIRcvgs;<KYm_}Q<b
zBV3Dz{bA_VCvN%s@OV(g$AKkW4pAD4!w;S0Lj#y-{f<vtf|e*DCPhzwwVcJ3u-5Vx
zJ0mL2w{=2|PJXxb;WDG*L7x@fOa<APiua?9SXZ(u&Fok`z4_u9Mp@~Vfu5~NzW<eF
zvs$xVgXgrJG`V^q0rVQ03=Y$@Mwc%y#=&xl5V|ZSxRCC_%c*sI!nx7g?ZIktnj5)6
zW=#5vE6P-pK|<D3Mf&^$BL?XI9~j;Vuq(NDzfrAK>BZ^4r5r|jTJavY54~xh@|ugd
z%xrs1sb+jGx&l)UD6Kcku(_vZzfLW9oUz!kjz}VYm1W}{OuJHecxulfdyXF!a$#{)
zwm}hybJI%MjF2DVY#`z4^M(^8AiE7B3sP3F!2}S85sV9RDO(V2FbTwEL=${Yl*DpL
z5^3oax+)DPZv&~{0*k^ppUKjp86dSrUMT0ghiLO1Aaz^5Eb)`PB3HVc?z<l$x(1!+
zUy#Y*2QsHS7H8MoO7%Ts)$pTjm^uR|J{frDv@*N)#Z<Tbx0DdBdvW@K-7&yV@MAq<
JzL?Dk(jQ)P2T1?`

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml
index 5b48a94e8..f13f40b8f 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.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="RelatorioBPe" pageWidth="1350" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="1310" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="2de20ee0-535e-49d2-a7be-c24a30351d9f">
 	<property name="ireport.zoom" value="1.0980750000000004"/>
-	<property name="ireport.x" value="453"/>
+	<property name="ireport.x" value="534"/>
 	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="title"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
@@ -160,7 +160,7 @@
 				<textFieldExpression><![CDATA[$R{label.valorBPe}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="f9f9f464-c0da-4d85-ad06-06567943eaa8" x="782" y="0" width="252" height="15"/>
+				<reportElement uuid="f9f9f464-c0da-4d85-ad06-06567943eaa8" x="792" y="0" width="252" height="15"/>
 				<box leftPadding="5"/>
 				<textElement>
 					<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
@@ -168,19 +168,12 @@
 				<textFieldExpression><![CDATA[$R{label.chaveAcesso}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="aaabe6ae-6466-4b39-8f39-b94460463dc8" x="1120" y="0" width="100" height="15"/>
+				<reportElement uuid="aaabe6ae-6466-4b39-8f39-b94460463dc8" x="1130" y="0" width="100" height="15"/>
 				<textElement>
 					<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.status}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="bdb50181-e913-4a43-9344-c599b323706a" x="1220" y="0" width="90" height="15"/>
-				<textElement>
-					<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{label.obs}]]></textFieldExpression>
-			</textField>
 			<textField>
 				<reportElement uuid="b930a70b-3907-4075-b4b4-7abd52944701" x="105" y="0" width="90" height="15"/>
 				<textElement>
@@ -196,7 +189,7 @@
 				<textFieldExpression><![CDATA[$R{label.valortarifa}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="abec744e-661d-407e-b21b-92cedc682316" x="1090" y="0" width="30" height="15"/>
+				<reportElement uuid="abec744e-661d-407e-b21b-92cedc682316" x="1100" y="0" width="30" height="15"/>
 				<textElement>
 					<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
 				</textElement>
@@ -210,14 +203,14 @@
 				<textFieldExpression><![CDATA[$R{label.destino}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="6eb33a55-1523-4031-9157-04b92fd09603" x="741" y="0" width="41" height="15"/>
+				<reportElement uuid="6eb33a55-1523-4031-9157-04b92fd09603" x="751" y="0" width="41" height="15"/>
 				<textElement textAlignment="Right">
 					<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.valoroutros}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="61f831c0-e2f4-41b8-bd2c-09cd8f327e72" x="691" y="0" width="50" height="15"/>
+				<reportElement uuid="61f831c0-e2f4-41b8-bd2c-09cd8f327e72" x="691" y="0" width="60" height="15"/>
 				<textElement textAlignment="Right">
 					<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
 				</textElement>
@@ -231,7 +224,7 @@
 				<textFieldExpression><![CDATA[$R{label.valorpedagio}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="fa7c03df-c59f-4e31-96fa-8a508c19746d" x="1034" y="0" width="56" height="15"/>
+				<reportElement uuid="fa7c03df-c59f-4e31-96fa-8a508c19746d" x="1044" y="0" width="56" height="15"/>
 				<textElement>
 					<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
 				</textElement>
@@ -244,6 +237,13 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.valortaxa}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="bdb50181-e913-4a43-9344-c599b323706a" x="1230" y="0" width="80" height="15"/>
+				<textElement>
+					<font size="10" isBold="false" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.obs}]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
@@ -291,7 +291,7 @@
 				<textFieldExpression><![CDATA[$F{vlbpe}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true" hyperlinkType="Reference" hyperlinkTarget="Blank">
-				<reportElement uuid="6db62c93-f853-4396-89ce-afcc6d510d91" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="782" y="0" width="252" height="15" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="6db62c93-f853-4396-89ce-afcc6d510d91" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="792" y="0" width="252" height="15" isPrintWhenDetailOverflows="true"/>
 				<box leftPadding="5"/>
 				<textElement>
 					<font size="9"/>
@@ -300,7 +300,7 @@
 				<hyperlinkReferenceExpression><![CDATA[$F{qrcode}]]></hyperlinkReferenceExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="fe71d802-0ba0-4336-b76a-f72a37b23075" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1090" y="0" width="30" height="15" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="fe71d802-0ba0-4336-b76a-f72a37b23075" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1100" y="0" width="30" height="15" isPrintWhenDetailOverflows="true"/>
 				<textElement>
 					<font size="9"/>
 				</textElement>
@@ -328,40 +328,33 @@
 				<textFieldExpression><![CDATA[$F{valorpedagio}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="021b8a1b-3497-4eed-b96e-985ec4329c5b" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="691" y="0" width="50" height="15" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="021b8a1b-3497-4eed-b96e-985ec4329c5b" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="691" y="0" width="60" height="15" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right">
 					<font size="9"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valorseguro}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="66eaa400-673d-4b37-b2ef-982910e6c78c" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1120" y="0" width="100" height="15" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="66eaa400-673d-4b37-b2ef-982910e6c78c" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1130" y="0" width="100" height="15" isPrintWhenDetailOverflows="true"/>
 				<textElement>
 					<font size="9"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{status}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="5d4d7677-7d6f-493c-87bd-a15faedee6e0" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="741" y="0" width="41" height="15" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="5d4d7677-7d6f-493c-87bd-a15faedee6e0" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="751" y="0" width="41" height="15" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right">
 					<font size="9"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valoroutros}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="07f16df1-fd27-46ba-9262-835eb8dddc96" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1034" y="0" width="56" height="15" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="07f16df1-fd27-46ba-9262-835eb8dddc96" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1044" y="0" width="56" height="15" isPrintWhenDetailOverflows="true"/>
 				<textElement>
 					<font size="9"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{num_bpe}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="7b8ce326-5e48-4b4f-ba2d-60fabfdc4119" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1220" y="0" width="90" height="15" isPrintWhenDetailOverflows="true"/>
-				<textElement>
-					<font size="9"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression>
-			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement uuid="b08970a6-b8fc-4210-a7ba-1cafd0166131" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="570" y="0" width="61" height="15" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right">
@@ -369,6 +362,13 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{valortaxa}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="7b8ce326-5e48-4b4f-ba2d-60fabfdc4119" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1230" y="0" width="80" height="15" isPrintWhenDetailOverflows="true"/>
+				<textElement>
+					<font size="9"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<lastPageFooter>
@@ -399,7 +399,7 @@
 				<textFieldExpression><![CDATA[$V{totalTarifa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="933b9f19-86f6-40c1-a117-ac27ada061b7" stretchType="RelativeToTallestObject" x="741" y="0" width="41" height="13"/>
+				<reportElement uuid="933b9f19-86f6-40c1-a117-ac27ada061b7" stretchType="RelativeToTallestObject" x="751" y="0" width="41" height="13"/>
 				<box>
 					<leftPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -410,7 +410,7 @@
 				<textFieldExpression><![CDATA[$V{totalOutros}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="b5c7952a-dda9-4351-ae90-2a281d2ecebd" stretchType="RelativeToTallestObject" x="691" y="0" width="50" height="13"/>
+				<reportElement uuid="b5c7952a-dda9-4351-ae90-2a281d2ecebd" stretchType="RelativeToTallestObject" x="691" y="0" width="60" height="13"/>
 				<box>
 					<leftPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>