From c162877be749e3eb783ead6ce032de8b5c2c2db7 Mon Sep 17 00:00:00 2001
From: walace <walace@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 11 Jul 2019 18:53:02 +0000
Subject: [PATCH] fixes bug#14916
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

qua:
dev:wallace

Foi tirado a mesclagem da célula no jasper

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@95663 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../RelatorioVendasBilheteiro.jasper          | Bin 47180 -> 47177 bytes
 .../templates/RelatorioVendasBilheteiro.jrxml |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBilheteiro.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBilheteiro.jasper
index 465818debc8c368e02fa245e93748ad946d8bb70..2fe7a9d3652090f6805a7c90f097f744de55615b 100644
GIT binary patch
delta 214
zcmX@}f$8K2rVWf7j0~HZINS{wc{Y1l{FVh$Zebq<Cp%{dvD%g}FdA$Q%y`7c$hg@g
z|2rci&*c6JvCU3}(K3tzljrqH0LksW-V$a;=9Wf=29~DACh;bwMy5s<><o;I3_6nw
zS!Fhx_1$EeY&cP5GXF%S&8`zCvMaNP28TKZdHQoOJZ5AN4RQ_e4+@EQ^AGZM1X7O9
tA^t&;n}5!@FTj|)`Q}Q0Rv@Lh9!ynk>0uVdw5)`|XtE)@%w)42VgR}eL0<p>

delta 247
zcmX^4f$7W#rVWf7d|VX;3=Buz7=VDWpkVTcY_-j%93lpc+?%~De#-(Wx3G_bQY?lB
z=Ej8#b<DOU42%XKhGPi>OG!~_>Sn);M{JB-n+@~7GcpQn)+{WPk>V-m02(I%GP9x>
zq}a*c0mNb8nY^XfThPGR+|=0I($dVxEZ)-C(8PGNK;Ivx$qEydgaiu`ixP8FOHzyC
zLxV#dgFO8=J4~F+KKa263GT;?4D2w$Z!_)-Fy?Q*w$h&!NU5y{Q)OFvm_;!Rw<uvS
Nnrz4}Gue2D7yyM!NcjK&

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBilheteiro.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBilheteiro.jrxml
index a3b14ac30..c60f254af 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBilheteiro.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBilheteiro.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="RelatorioVendasBilheteiro" pageWidth="1200" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1160" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b92fb063-a827-4619-8a69-5c78e3afbb8c">
 	<property name="ireport.zoom" value="2.0"/>
-	<property name="ireport.x" value="1073"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
@@ -149,7 +149,7 @@
 		</band>
 	</pageHeader>
 	<columnHeader>
-		<band height="11" splitType="Stretch">
+		<band height="12" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="244" y="0" width="60" height="11" uuid="175c2491-a0c4-47bb-bfb1-f8cbdfff876a"/>
 				<textElement textAlignment="Left" markup="none">
@@ -276,7 +276,7 @@
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="11" splitType="Stretch">
+		<band height="12" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="84" height="11" uuid="bc091860-adab-47d8-8352-982bc8e484a3"/>
 				<textElement textAlignment="Left"/>