From 6dadffaa65af97763631a8574a66a385114e55a1 Mon Sep 17 00:00:00 2001
From: valdevir <valdevir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 6 Nov 2020 23:10:33 +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@104181 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/templates/RelatorioBPe.jasper  | Bin 50063 -> 50034 bytes
 .../relatorios/templates/RelatorioBPe.jrxml   |  62 +++++++++---------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper
index 54418aa360ff52f568e7dc42115d676d4aa7ba73..6a0bcd572c80d02bdee2366c1a76e459f824ff58 100644
GIT binary patch
delta 1736
zcmZ{kYe<t}6oB`-k(ef4Myc7=Pr7Q`%w}apX+yHqQj3U+(fz)amYJJQn!_BqIwToL
z7m1>%tX0sT3i{Ut>PH0r&~^D476lOz)qBo+{7hTlkHd4`^S$Re-}`M}d%*am#n_X(
zP9%iqth=5RBP`**9mQirN;s?bkr=hCysD~v6)Y{v1k(|RTrE9f7odfvz>T^RQ;I<t
zV4xxm7T0D%&e2T?#@}v(SB0P8^NwG`3$8<Q-B4mMJgIWYOTX#2Dy;rrq4M7X40zLH
zj6cB~vO-0DiAaHnrz1XDwlq;ll-|ryDu>(0QwP!6q@&fN<A66qBvP-h$IMXHI4>Tb
zNnM4|-WZI}!p;;XQ)iV^XGZMIh@Ba+^JMDW;W5M4rffLikjDyz4fZ78i;R`QybEV*
z+LyR(H;bwvQePgQk0J^-5~-X-j3{D65hIFhBwEmDhHIXDDe0`YPdu0N;bO_%>em|!
zo~3<kb*vaXN<4kjTzK0!+lpkz;Lt;{dLw0gH?Gguiw>Gb-3&Mlqnu`fLVCBRMXE_P
zziU%5jo05~hS-MjN!YH)Rp&y5Jn0me>RT&T!%^Q=Z3EUQR1TkmhE`RYfe~k5#1ml*
zHE$D@@U8i~?E2C_POOCszOgXjxJ#?U{uJC%`l~ASXT<)D*q`y%iLtR;X(Bg#ZW%Xv
z=iqbhh6Voh@GvV4uKTrN@?ZY#S`g(F0#W3uN^(Y&GoqYvNFEp|PY%=z7X$+fb#)}r
zpj|>Og{~-CRV6JWY8g?>IHc_wsdZ;%LUwD5F2%#{ZQZWjLotP(C}LG5F(Zl@QOr0b
z?ujOjYxB`Fr$KjHsvN;NJp*2~m1@sXPT^@3xvG+!5#@|ho~{tzD}A~2U-DD1$WNhb
zMsoOB@VsE3|KxPh3pY<T%iP-T)ZU?+LL`b?RmshWZbs>zqwrsM1egB4ywYQQ5B-O;
zVR<N5yn&h!{^~kIr3s(ZzY7QH3x5vn7fE)Db-vAFvE^;fw^;KEY~lT<TPNjSzAp+N
zi@B?=81iS{HFW9OG?|^(vviqt%M6+xObQp@NsOH(_njHGk2BuK8SM*u9#~>g)H!Se
rXS{(k7Il*7$K#5a<dI|7fY>t;Jg4HutZ*K7ZYesj&$Vmswu65Fei~0T

delta 1804
zcmaKsT}YEr7{}kEW2LXl$s}7XL@ind%a46TSs*h@tw`vbGOcDvrSH_*Qs>OlW!79h
z7!>qHR%j5>+Xs=Q(nWWbcw5l~k#4+*sEa5%=Q+oi_2Mobp1=Ih`}=J>^J`~(PbmJO
zZ6}$luH1RwsEc>x+tm+;iwwk|W*i?P`pqRpMVr<`q1ys+zGC{<5}%8}ubu?>d?FKW
z`8Vne5|LnP>jIbxSRmtMMUswqrB)pAzrogQ(en&dou+iYDh;$Dl}pm=Z3=x&*L4I&
zdQ8*xXsbDnK0xuOk{`$~YT8H);0wBp4<gyt#kRLEpS<bK{@Cv>huo7}l5{5a92`c(
z@{Cx%YG6f&VZ|D4T}X^E)XC;lc;B`N-uumzzS_2ky-(xyYF|O=^T6G!d%q6MTjx&Z
z21}U%j!ZP*84dWVVIVrpK&;FlGsfV2AQcLO4obh!bXj&W1`azict!?aH5j797-D4%
zyI`aQbKqyQGnsvn{Iyn+;?_VkupDYy_RA%Vh@%*ZJR^~>8br}yM6ohram>3KY)gfk
zfu)Ilg<S*6HNeld9b^~W3Yoxjs#iY1usHUB_l!x;Gh+FwffXHw6>CkqhwOoovnCjC
zpTMW5k$o`IF(1C4R^%XK;P4}ZXJqhIgCRPUktI4xqok{?tM%~mc7CCc;I;NsbXsEF
z^ey*-sbe?s!BAEjoatB+<I^GobHNct7oO3DuNp3*!(2pX7MJk9F5WB)=tC9M#}ir;
z<1!!Kg{tL#=7XaTeRxJ6zH0c04)YP6S$z7me14zpoMEDNRm+3S1jjQp;TcW%s$n8J
z%tUl%F?ptCGJft9{bUYxub@6v)`c+8T_%q)6C9&x!ZVuiRl`JdsEJv0=xu1A50dCj
z;df;ea_Ik8WqFF)cm4(uyo#`uL?IMz7kNp~2Kfu)<CsJ~&&cPi248d-Uv&QCPtxCI
zE?6Tr@(I$zW>6wBg|<Y>lD_d@C&NytW06{7bmll6PM3X^Yri8eFF$vcT7Ic3-FEva
zDHta9&G#fn_G9VB-?WUTJAadzrfW38tKoEY*`s-LR?u_3GtP-5&WVKQ)XL{Mc;L#6
q10sn7BJl$+hU?=@|N1scd640-K;^{*Luu8Cs)O#jV@l0YPyHXVXJGLF

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml
index f13f40b8f..1cc589ec1 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="534"/>
+	<property name="ireport.x" value="0"/>
 	<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"/>
@@ -372,23 +372,23 @@
 		</band>
 	</detail>
 	<lastPageFooter>
-		<band height="8"/>
+		<band height="12"/>
 	</lastPageFooter>
 	<summary>
-		<band height="13">
+		<band height="18">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="95d7aa90-90da-4ddb-b63d-16a69e4996aa" stretchType="RelativeToTallestObject" x="0" y="0" width="86" height="13"/>
+				<reportElement uuid="95d7aa90-90da-4ddb-b63d-16a69e4996aa" stretchType="RelativeToTallestObject" x="0" y="0" width="86" height="18"/>
 				<box leftPadding="0">
 					<leftPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
 				</box>
-				<textElement textAlignment="Left" verticalAlignment="Middle" markup="styled">
+				<textElement textAlignment="Left" verticalAlignment="Bottom" markup="styled">
 					<font fontName="SansSerif" size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{header.filtro.total}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="2998b4f4-b73e-4a24-9a40-d645ffe3b542" stretchType="RelativeToTallestObject" x="501" y="0" width="70" height="13"/>
+				<reportElement uuid="2998b4f4-b73e-4a24-9a40-d645ffe3b542" stretchType="RelativeToTallestObject" x="501" y="0" width="70" height="18"/>
 				<box>
 					<leftPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -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="751" y="0" width="41" height="13"/>
+				<reportElement uuid="933b9f19-86f6-40c1-a117-ac27ada061b7" stretchType="RelativeToTallestObject" x="751" y="0" width="41" height="18"/>
 				<box>
 					<leftPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -410,29 +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="60" height="13"/>
-				<box>
-					<leftPen lineWidth="0.0"/>
-					<bottomPen lineWidth="0.0"/>
-				</box>
-				<textElement textAlignment="Right" verticalAlignment="Bottom" markup="styled">
-					<font fontName="SansSerif" size="10" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{totalSeguro}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="9a5cf2aa-0e3e-430f-9e66-773c4ab97da6" stretchType="RelativeToTallestObject" x="631" y="0" width="60" height="13"/>
-				<box>
-					<leftPen lineWidth="0.0"/>
-					<bottomPen lineWidth="0.0"/>
-				</box>
-				<textElement textAlignment="Right" verticalAlignment="Bottom" markup="styled">
-					<font fontName="SansSerif" size="10" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{totalPedagio}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="3ab6c285-6689-4eb8-8d8c-3e6d80f6df1f" stretchType="RelativeToTallestObject" x="403" y="0" width="98" height="13"/>
+				<reportElement uuid="3ab6c285-6689-4eb8-8d8c-3e6d80f6df1f" stretchType="RelativeToTallestObject" x="403" y="0" width="98" height="18"/>
 				<box>
 					<leftPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -443,7 +421,7 @@
 				<textFieldExpression><![CDATA[$V{totalBilhetes}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="f51d8633-b5be-438d-938a-d9ab8001fac0" stretchType="RelativeToTallestObject" x="571" y="0" width="61" height="13"/>
+				<reportElement uuid="f51d8633-b5be-438d-938a-d9ab8001fac0" stretchType="RelativeToTallestObject" x="571" y="0" width="60" height="18"/>
 				<box>
 					<leftPen lineWidth="0.0"/>
 					<bottomPen lineWidth="0.0"/>
@@ -453,6 +431,28 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{totalTaxa}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="748f3f71-32ae-4355-81cd-1a4c8c33a098" stretchType="RelativeToTallestObject" x="631" y="0" width="60" height="18"/>
+				<box>
+					<leftPen lineWidth="0.0"/>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Bottom" markup="styled">
+					<font fontName="SansSerif" size="10" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{totalPedagio}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="5d38cb18-ec89-464a-9a2d-e4a148b455d5" stretchType="RelativeToTallestObject" x="691" y="0" width="60" height="18"/>
+				<box>
+					<leftPen lineWidth="0.0"/>
+					<bottomPen lineWidth="0.0"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Bottom" markup="styled">
+					<font fontName="SansSerif" size="10" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{totalSeguro}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 	<noData>