From 88999f267c397e8661b7a194e3fd275c09d2a0a3 Mon Sep 17 00:00:00 2001
From: thiago <thiago@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 4 Jul 2016 13:01:27 +0000
Subject: [PATCH] fixed bug #7423 - Corrigido layout de campos de data.

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57517 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../RelatorioOCDNaoResgatadaEmpresa.jasper    | Bin 39558 -> 39561 bytes
 .../RelatorioOCDNaoResgatadaEmpresa.jrxml     |  36 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jasper
index 92300c6ca2e7c2680f1f840ae896a90fbbf787a4..1aa878bbd4cd9853aaaeec95d6de99e6d4d878e3 100644
GIT binary patch
delta 1390
zcmcJOPiPZC6vk(^Nu#xdHd!o2O-xO?O={vMb!&5|#XlIts0lVwP)tFJ6tztoQR$&Q
z2%?9c-la+pib_2Qwyf2IQUpDS;K7?M#e=8fp+S*Qq@eRJ>n>T34rF-We3SS6c+B2f
zknSu<b030E4I%sk)V7Ge9(*l1_aTIqnEV>*#a<7><bbX$`DK2S1*1E|@Loy7{kBKY
zA8LlYBE#qQ7U+o`b&^|>0!@)(Xk`>lAhs<ROSC?V(A&NuS%$F!*zc|97vcMEZ-AHl
z`hd;#2iX=0EyH|x2Md1JF2k|t<Ip$Sk!`CsQQT!wqNGv0w22aTSkx+sih&lD;bq6O
zF#1Jv*jBO0;V#P&CCN$h(k4e3WFBlf7pjw~u*`=YGQ5g6xD)i4E*iZA^O@~%GnSLk
zIvm{FI_V;(m~GBlAa1z0kvC1#Vx0e%VV-~WAB4jUTQ`B7jCO0x?@lsI3+Y<iAeAX8
z+dMX;+_fP!8x~TtVIdVpEvbi*&c^+qs*Mt#rL%`T>KXFdM<#KQ60$8|L&#klLbG8Z
zG#eH|VHB?-$MDGTAnyrt*-a7-Fh-9m!;s?B52@pB3fi3A1z!&Q#53?I6VW$%yBzd0
zLm4Iqjx1I`TIy!f8};HNr1ILyG{%~~cq&!L-%L>Voj#7M_3ggDbtS)LvkR*?N@Hjb
zBwUKF7A||6x;pnKHBIYG6cWi)cdA=|I=1G^mtNq8H@NY{EGk5wqbr8W5jDuv8R8u#
z>Z0LkL=72AA?lK$wh?t*FHe;n{iO9dOKYJ-Yobi8g(q4IC0Yx`T9ckIJ{{2W@X_&q
T;GsO#s^6V{f@>xQxqI3lYzMlX

delta 1270
zcmcIjOK1~O6n$@;L=w_!GgJC8Bx#&9ZPK(eNo)=H|FqyIX|O5PO0!UrqC(mVO3@++
zf(r$?n;?i#C|wBFIM$U&!Cj#Xccq(37sZuD2_opi_sdw#Y<)17bKX6id*(9pa8Y`&
zD7{*4bLa@+Z=kD<@F}92Kib|&j&6j|x^=ao9mbFix*Z3}^=$PTd_Dc}ynPOqVhxaw
zsL-Xi!ZWRImlt88qi2{rXDt2s_5p2e0?i;+R*O><k0SJ8s7Q|0SOe@=oLmTB_ge5t
zhXwU)lY~~G9QMI_M;OK<O;FN&jyytANQ@iRK2t|lHf=`nE*m8v9VH+gB_JEMDMmHG
zSX2eMb58qC%~`3~nDZ_(7m%6@NX-Rg<`rTdhmSE8CZh{s>?F>-NVU$Q3*{~)z=d2h
zwrz`54L+%~2n|^;TlOWfXe_ar2jYI%in-ukq#v5QauSx|XirFMqzPD2Y!dJ;OTeK`
z0->P^gr+8e!V=7P`{6>|BVjKXnLThnZiNWZ5Ud1kLhvpN!J$nEp`js!rY1y?g=p4Q
z7>v8?lXN@u(9vG=m_AcagW*^ZHV#$rEaWnsuaES~4*ppaW?nw=zWTFJIymsl$-hD~
zmnmZLXVK19*0Y1|w|qKe2F{(rRs3k^5B`~VyJX2o--efcF*8}XuIx5a$#lv{_w6sF
z5(y*OYc5QFY0ckyi``4ub9NpTqHoZY#d3t*u-I|Jt}r%Cl=}#~YV{(7ja#gRuxl_~
z3YqHT6?uf%U;N8nFkvs4uqSMrz32&h!I(YqguA7HIRY#4|9Js(y0naye>Zj$CBWF}
MgBKGnxbw8`H?UBHGynhq

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jrxml
index 054a0945f..c7ca9eec5 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.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="RelatorioOCDNaoResgatadaEmpresa" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="RelatorioOCDNaoResgatadaEmpresa" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
 	<property name="ireport.zoom" value="1.3310000000000004"/>
-	<property name="ireport.x" value="19"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="22"/>
 	<parameter name="fecInicio" class="java.lang.String">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
@@ -38,7 +38,7 @@
 					<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="e8355048-a037-4837-866b-e6cf7a3e90ed" x="162" y="51" width="61" height="17"/>
+					<reportElement uuid="e8355048-a037-4837-866b-e6cf7a3e90ed" x="156" y="51" width="61" height="17"/>
 					<textElement textAlignment="Left" markup="none">
 						<font size="8"/>
 					</textElement>
@@ -59,7 +59,7 @@
 					<textFieldExpression><![CDATA[$R{detail.nombusuarioinc}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="d88253ec-b6d4-4e99-b677-3c1a0b273a81" x="76" y="51" width="86" height="17"/>
+					<reportElement uuid="d88253ec-b6d4-4e99-b677-3c1a0b273a81" x="76" y="51" width="80" height="17"/>
 					<textElement textAlignment="Left" markup="none">
 						<font size="8"/>
 					</textElement>
@@ -73,7 +73,7 @@
 					<textFieldExpression><![CDATA[$R{detail.valorPagar}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="31387dbf-1cdc-4c27-992f-2e439abea576" x="223" y="51" width="46" height="17"/>
+					<reportElement uuid="31387dbf-1cdc-4c27-992f-2e439abea576" x="217" y="51" width="52" height="17"/>
 					<textElement textAlignment="Left" markup="none">
 						<font size="8"/>
 					</textElement>
@@ -100,14 +100,14 @@
 					<textFieldExpression><![CDATA[$R{detail.nombpuntoventapago}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="958109bc-c1cc-4e09-bafd-a6213b6850e9" x="546" y="51" width="85" height="17"/>
+					<reportElement uuid="958109bc-c1cc-4e09-bafd-a6213b6850e9" x="551" y="51" width="80" height="17"/>
 					<textElement textAlignment="Left" markup="none">
 						<font size="8"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.nombusuario}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="a6d90199-4c64-42e7-abd2-7538664fb203" x="498" y="51" width="48" height="17"/>
+					<reportElement uuid="a6d90199-4c64-42e7-abd2-7538664fb203" x="498" y="51" width="53" height="17"/>
 					<textElement textAlignment="Left" markup="none">
 						<font size="8"/>
 					</textElement>
@@ -228,7 +228,7 @@
 				<textFieldExpression><![CDATA[$F{nombusuarioinc}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="2002ee08-18dd-478b-939a-05cd1174b364" x="498" y="0" width="48" height="17"/>
+				<reportElement uuid="2002ee08-18dd-478b-939a-05cd1174b364" x="498" y="0" width="53" height="17"/>
 				<textElement textAlignment="Left" markup="none">
 					<font size="8"/>
 				</textElement>
@@ -242,28 +242,21 @@
 				<textFieldExpression><![CDATA[$F{nombpuntoventapago}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="89eb3ac5-6fb8-4554-acaa-a9fd499cde57" x="223" y="0" width="46" height="17"/>
+				<reportElement uuid="89eb3ac5-6fb8-4554-acaa-a9fd499cde57" x="217" y="0" width="52" height="17"/>
 				<textElement textAlignment="Left" markup="none">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{fecpagar}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="3f2de0d3-e1e1-4c38-abe4-539529605c34" x="162" y="0" width="61" height="17"/>
-				<textElement textAlignment="Left" markup="none">
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{numoperacion}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="a1875870-b2d4-403d-abd0-2a4bc9a68e63" x="76" y="0" width="86" height="18"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="a1875870-b2d4-403d-abd0-2a4bc9a68e63" x="76" y="-1" width="80" height="18"/>
 				<textElement textAlignment="Left" markup="none">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement uuid="2cb4de67-a11c-45d0-a0a8-24f1e9a605c1" x="546" y="0" width="85" height="17"/>
+				<reportElement uuid="2cb4de67-a11c-45d0-a0a8-24f1e9a605c1" x="551" y="0" width="80" height="17"/>
 				<textElement textAlignment="Left" markup="none">
 					<font size="8"/>
 				</textElement>
@@ -297,6 +290,13 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{formaPago3}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="3f2de0d3-e1e1-4c38-abe4-539529605c34" x="156" y="0" width="61" height="17"/>
+				<textElement textAlignment="Left" markup="none">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{numoperacion}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<noData>