From 11a97d970c0f1723450c1138849730317d173cc1 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 12 Jul 2016 13:14:41 +0000
Subject: [PATCH] fixes bug #7678

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57839 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioMovimentosAtraso.java       |  31 +++-------
 .../RelatorioMovimentosAtraso.jasper          | Bin 34067 -> 34230 bytes
 .../templates/RelatorioMovimentosAtraso.jrxml |  53 ++++++++++++------
 3 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java
index 3505fbc5f..6462b8404 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java
@@ -5,7 +5,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
@@ -18,7 +17,6 @@ import java.util.TreeSet;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
-import com.rjconsultores.ventaboletos.constantes.Constantes;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.utilerias.DateUtil;
@@ -147,34 +145,21 @@ public class RelatorioMovimentosAtraso extends Relatorio {
 		NamedParameterStatement stmt = null;
 		try {
 			StringBuilder sQuery = new StringBuilder();
-			sQuery.append("SELECT DISTINCT B.PUNTOVENTA_ID, TO_DATE(B.FECHORVENTA,'DD/MM/YYYY') AS FECHORVENTA ")
+			sQuery.append("SELECT B.PUNTOVENTA_ID, TO_DATE(B.FECHORVENTA,'DD/MM/YYYY') AS FECHORVENTA ")
 				  .append("FROM BOLETO B ")
+				  .append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ")
 				  .append("WHERE B.ACTIVO = 1 ")
-				  .append("AND TO_DATE(B.FECHORVENTA,'DD/MM/YYYY') BETWEEN TO_DATE(:dataInicial,'DD/MM/YYYY') AND TO_DATE(:dataFinal,'DD/MM/YYYY') ")
-				  .append("AND B.TIPOVENTA_ID IN (")
-				  .append(Arrays.asList(Constantes.TPV_BOLETO_REMOTO,Constantes.TPV_MANUAL,Constantes.TPV_DIRECTO_NORMAL, Constantes.TPV_TRANSFERENCIAS).toString().replaceAll("[^0-9,]", ""))
-				  .append(") ")
-				  .append("AND ( ")
-				  .append("		(B.INDSTATUSBOLETO = 'V' AND (B.MOTIVOCANCELACION_ID IS NULL OR B.MOTIVOCANCELACION_ID IN (")
-				  .append(Arrays.asList(Constantes.MVO_CANCEL_CANCELACION,Constantes.MVO_CANCEL_DEVOLUCAO,Constantes.MVO_CANCEL_TROCA).toString().replaceAll("[^0-9,]", ""))
-				  .append("		))) ")
-				  .append("		OR ")
-				  .append("		(B.INDSTATUSBOLETO = 'C' AND B.MOTIVOCANCELACION_ID IN (")
-				  .append(Arrays.asList(Constantes.MVO_CANCEL_CANCELACION,Constantes.MVO_CANCEL_DEVOLUCAO).toString().replaceAll("[^0-9,]", ""))
-				  .append("		)) ")
-				  .append("		OR ")
-				  .append("		(B.INDSTATUSBOLETO = 'T' AND (B.MOTIVOCANCELACION_ID IS NULL OR B.MOTIVOCANCELACION_ID IN (")
-				  .append(Arrays.asList(Constantes.MVO_CANCEL_CANCELACION,Constantes.MVO_CANCEL_DEVOLUCAO).toString().replaceAll("[^0-9,]", ""))
-				  .append("		))) ")
-				  .append("	   ) ");
+				  .append("AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ");
 			
 			if(empresaId != null) {
-				sQuery.append("AND B.EMPRESACORRIDA_ID = :empresaId ");
+				sQuery.append("AND M.EMPRESA_ID = :empresaId ");
 			}
 
 			if(puntoventaId != null) {
 				sQuery.append("AND B.PUNTOVENTA_ID = :puntoventaId ");
 			}
+			
+			sQuery.append("GROUP BY B.PUNTOVENTA_ID, TO_DATE(B.FECHORVENTA, 'DD/MM/YYYY') ");
 
 			log.info(sQuery.toString());
 			
@@ -342,8 +327,8 @@ public class RelatorioMovimentosAtraso extends Relatorio {
 			cal.set(Calendar.MONTH, Integer.valueOf(vetCompetencia[0]) - 1);
 			cal.set(Calendar.YEAR, Integer.valueOf(vetCompetencia[1]));
 	
-			this.dataInicial = DateUtil.getDateFromString(cal.getActualMinimum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy");
-			this.dataFinal = DateUtil.getDateFromString(cal.getActualMaximum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy");
+			this.dataInicial = DateUtil.inicioFecha(DateUtil.getDateFromString(cal.getActualMinimum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy"));
+			this.dataFinal = DateUtil.fimFecha(DateUtil.getDateFromString(cal.getActualMaximum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy"));
 		}
 		
 		if(status != null) {
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jasper
index 3bc1bc17ebc6b1e3b7882f2f5c73d8dfeeb7aa8c..58b7eda11ae068690c784d7f9ff493598663f6e1 100644
GIT binary patch
delta 6978
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

delta 6368
zcmb7|e@t7~702H-U`Y5;2)4n-Ha4U{!w&-)Kgw@H9DbP}AsCW02{^%HWX2eHglO6z
zXxda|3R`ym=+>@Prv1@Q+qz6v(==0;?2l=R*rsNGMcLM<+PX=rG?A{VHl-W8=iX=g
zJ-?eJaiqh|`<{Ex`P_T%d-uI--!Q;M!`1gpBoZw$y9nurHj9<o&SwfCY{{gpJL4wU
z#8&iW%NxWvxG1ejgV0wvST!U`zd975KX!?k$TI#B2ynBo*Ce<e0kW$SyjE+zK#VS0
zYf?xr<ejp?4g0|7l~BDH6MrmNAOGW1Co_jxFf+^5F}*5Cm3M<~M}9qTa-T^-=UDV(
zm<L9ig$++>(Mgullq5;HD|q!ZZ4q{D20nE-6&8>4DOk?oILycb7Oo0dxWHJ{J{lH9
z(6PwK^0@>{UNTFXEM<fOr-PxI6<ied!!-F)y;l4bcwfbS%xnnoxGKQo0>e}LXz&z)
zX2(__zEm4YOSLB%5AL~2_);0AB}p<Igj@FK;E=oM$t&<%h{epN0E?>vEG{rCwT}i%
z5p-CaNm%(htRp3*F{}#|>l(wlRq_;AuOb#RuL!WXD!}3b!&3WbuoOXu^$KD+62)jr
z#!8c6deH<~`?5%Hbi34OFb}IY>`x;2KWPo_WEMkhMjCj^E<O1=zJtKbye$CcssNY^
z3|Q@>0agSZ@Y_l2Xif%(H_LGye_y_BV#`SHF;WEc%tdn>epzXQ?TRA!Y#{Hj=<fJi
zbYo^qz{FJn6Bihh+DF5r2s);%BqocF>EF*4^V&4?EhmCHy^leSilFWx6f<`PP+S#2
zF#&#dDt|xke2@ERpp?!!sJlr}1v;oNR+e!nc&*q(aAg`Exhj7{0A@ZE0B}_Rzy-D{
zY99@NBIp1<L;!nYYZWE~q`*#-1s+z>oy8u)9w(=;!Qtvh*ViXV!pz4460QnJxWGu%
zJ{l55(2;zMBsB>VtBypL45DY%4SS5}S`8!0h!q!XR$DT56aaX?x{wSp>qlFr&WaEU
zObAVid&eI%J4pp%OU?>zdSYjSe|chwl-IIE)?<mNZe}D0BQcYupISxLPpwAq>&N3g
zG)Os%IT$Iy1m`_fs^d+O4yCrvp;XED@?$73)jb-e2vL}^3Q)KzKv4@C6t$p1DOxPR
zNC^~dVQ_2G^4N7uSL*5VL~quwrdsz$WGN@SFn>C-5|$Uv1;cUxPZgvQK4`KRqM99E
znIA=QLMxK}aHXk$J7%LJEyP4us{Xgh&Q-(y2!txF#<*G#U1*jG6^lDdz}S*c{9tP-
zq5p4hv1a(O<YdVLmuD=QY^F#fC8JM6pA%kfv6Uze*#q52M!jQGW8Tq`v2m57Q~?_;
z73utnA2M2<bma2ZVj88l)v=ciCgq(CoD0;10^!-3{;(XJ4K6AEEIMqTHDzmu3{*Jb
z*R8p9kh`spG@g<Bpc4w)toB$&Je4WmNKd!Vt8|B<HaqQfwyl(AvDvn_SaHr(oX7iz
zyi><VhU5Ns+MLvXyR9UhXIcYw>2_#nFQiw8+g)^&g?2Y>Uv4j_?RVO%X#212ZY8A;
zEKb<hQJ{<B9UAp@k9&{AvYPI2(S92pg>;OUJ8WhpE90Sl-?(=y=7sC?Q3tNiPDe5I
zEbeTeZGWemwpTkH7C(`2t<r<@k)_~rAl8kRj#H7I2`?NB$bqq7C?GE^%`K>0=t!ii
zK%r!7X6I^b)RpCxfUe7hE(Z-xBhc<Y@4}+t?T4}Jw18MrW^m7#l`3FPyA)y1GTiD`
z3fIW5!Sq=xe6!ogN3$u8nP(Q}BSASBJ~O9AvnulL#Fo)gO&_o-X*I%22QJ#)mnBk*
zo9d6Ulu}pIfXzSQweyfOS{a?~iKdwG-AdAJR8Q|$n&<i8A4$^cKj>SRguNf|o&Je(
zXU5J%(Afp4efeJUP?l0hyL-LZGkLT%ytpk(X+0zU;c@mtfuk7&qdCFVpXwy)peX`3
z+qVbO;oZL62J)FGAiZWtkH<+B3?PV;CUB#1j0blk*A&Yg?|p{U$A>fu#u9`~7r4=o
zg=U;iW6y}sKQzpPtu0AyY>(n8e0ZRVjKS9jy3Cb$KjtsdZ^jx|;SU4#q9>rigV{4v
z&DL8|zuGG*7t|jVG=loEp%K)N4Jy#bhQWgwu~mpY)eY6~gTW=$qtKz7fLfo8J_-kY
z7swm%8{b~iMGt=Y<SL{MxvlDV6T<=iZbFfyw}7|{;CGYxaqqRE^XrfO)L|IF`Cx|M
z7`5}kRl$6y1<ib@g~?}CX9Xpaem=bL;Dyrl#Mvt+J|Db%XXw|0+%xoR!I?nl3kx-o
z!0cR@Jv*ftB1^kmm97%{uhPY4c_vksGFhz-`-cvA$M{9+m!Wl|V`e4BoC#Xvj>!W?
z{Uf;s@+0_ZR%P_^;d(-T3>`UT(Z7!k8rFNULcPOyBai>sK!UTEA%ru{%$%U|xGI=w
zwV;{l&|)nP$h&Atk9T2-Xv$>{{^ED-ju+w_<V{$ie4>Y}C<V4YQ37{NhdR2a=^G*L
zbLsH~^ku|iW>vw0OMX1;QVYv|Yn3K7?v2l~)bK($$a};yTE$XOZH<h0Da1a4eP^;i
zp6#cT<<Iv$S&|nqNoHP*CHbETOp;po^MqA%9_Nl1^_BW!QhK{|>7^bE#MArIF}H(`
z@#qAh`KW{5!@hqspPksGA#B3vQ74(Cts-&^-aV>5Gw+UvOX1ZDmySD3qD=t5IF5G^
z{O<YB<ED5<_7~ji|2HG`cKsnv88fddQ>ItBpt(`<Zd}lmD;KJ`qNxd`3(bsS#jD}<
zr0LGo@q13##QY~u6fpkMtO~XOxd;=h^6Mv_Vj6B>PiC(3^fb>4u5v*$4QfF%4O|dS
zgVIGe4cC*VAxk$6TPJN*qB1b3PK<O|{IP1Jg;5hPit$sAE7P45mW<m9JdB*gZG+a2
zR=aVwaI&^Aj&>z)Cn03(5N4;G;+6dFR1satx2E1JYVt{YX6O-jIVktg^Wt16hzDL8
zku<@T>1S>CJG<zCN|LfxGpNnQ=6Otm+=u(qN6Zb)&Gn7X*EKaaHBQwv)HO8Jrb`4K
Sgvz4x0mI%sdKosp*6=?)hJU#L

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jrxml
index f383ffe2c..1d5169a56 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jrxml
@@ -1,6 +1,6 @@
 <?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="RelatorioMovimentosAtraso" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="822" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4">
-	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.zoom" value="0.75"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="Crosstab Data Text" hAlign="Center"/>
@@ -49,28 +49,28 @@
 			<textField isBlankWhenNull="true">
 				<reportElement x="0" y="60" width="637" height="20" uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3"/>
 				<textElement>
-					<font isBold="true"/>
+					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{cabecalho.puntoventa} + " " + $P{puntoventa}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement x="0" y="80" width="801" height="20" uuid="979b7126-0e47-4885-8a07-d8f9aa75a204"/>
 				<textElement>
-					<font isBold="true"/>
+					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{cabecalho.usuario} + " " + $P{usuario}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement x="0" y="40" width="637" height="20" uuid="90cdfa43-be94-4edc-b974-e267d2c5e82a"/>
 				<textElement>
-					<font isBold="true"/>
+					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{cabecalho.empresa} + " " + $P{empresa}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement x="0" y="20" width="637" height="20" uuid="f75c1624-725f-4ed7-9db7-7d396221d505"/>
 				<textElement>
-					<font isBold="true"/>
+					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{cabecalho.competencia} + " " + $P{competencia}]]></textFieldExpression>
 			</textField>
@@ -95,42 +95,42 @@
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="82" y="0" width="151" height="20" uuid="3f75c9b2-2080-4269-aadc-c7b914f07203"/>
 				<textElement>
-					<font isBold="true"/>
+					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.puntoventa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="233" y="0" width="105" height="20" uuid="0b6d3444-aed1-4928-8f1a-d4b48b269ec7"/>
 				<textElement>
-					<font isBold="true"/>
+					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.telefone}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="338" y="0" width="42" height="20" uuid="8b479f1f-b6d6-4b33-a8f4-d72551fa3def"/>
 				<textElement>
-					<font isBold="true"/>
+					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.uf}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="380" y="0" width="200" height="20" uuid="b2bbb907-984f-409e-9e36-c9f8e45361b6"/>
 				<textElement>
-					<font isBold="true"/>
+					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.subordinante}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="580" y="0" width="114" height="20" uuid="e0e1ce89-2e4d-4b99-bbc0-542bb917f3d7"/>
+				<reportElement stretchType="RelativeToTallestObject" x="580" y="0" width="82" height="20" uuid="e0e1ce89-2e4d-4b99-bbc0-542bb917f3d7"/>
 				<textElement>
-					<font isBold="true"/>
+					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.periodicidade}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="694" y="0" width="128" height="20" uuid="8c5a026b-3efc-4830-994b-158fd657c748"/>
+				<reportElement stretchType="RelativeToTallestObject" x="662" y="0" width="160" height="20" uuid="8c5a026b-3efc-4830-994b-158fd657c748"/>
 				<textElement>
-					<font isBold="true"/>
+					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.diasEmAtraso}]]></textFieldExpression>
 			</textField>
@@ -140,7 +140,7 @@
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="82" height="20" uuid="34f306b0-fcd2-421c-84b8-8b863c4ee958"/>
 				<textElement>
-					<font isBold="true"/>
+					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.numpuntoventa}]]></textFieldExpression>
 			</textField>
@@ -149,31 +149,52 @@
 	<detail>
 		<band height="25">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="694" y="0" width="128" height="20" uuid="dc1ce697-5085-42fb-aa3f-15dc7368cd50"/>
+				<reportElement stretchType="RelativeToTallestObject" x="662" y="0" width="160" height="20" uuid="dc1ce697-5085-42fb-aa3f-15dc7368cd50"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$F{strDiasEmAtraso}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="580" y="0" width="114" height="20" uuid="c479c5c1-f2f1-4c10-b812-19b8f371a912"/>
+				<reportElement stretchType="RelativeToTallestObject" x="580" y="0" width="82" height="20" uuid="c479c5c1-f2f1-4c10-b812-19b8f371a912"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$F{desIntervalofechamento}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="380" y="0" width="200" height="20" uuid="b1576f5b-e86a-4713-81ad-9d394c34fa7e"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$F{nombpuntoventaPadre}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="338" y="0" width="42" height="20" uuid="10823e45-0be5-4ac1-9948-a3428923d075"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$F{uf}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="233" y="0" width="105" height="20" uuid="673869d3-710d-4bbd-8545-9b2d70a18541"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$F{numtelefonouno}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="82" height="20" uuid="426ff840-8693-4d88-8372-00797accab08"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$F{numPuntoVenta}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="82" y="0" width="151" height="20" uuid="f0fd7c82-9814-48bb-a6cd-a078eea4672c"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
 			</textField>
 		</band>