From 46c70c5e1b5b394e1e0880c5921f7ff8242b3637 Mon Sep 17 00:00:00 2001
From: thiago <thiago@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 7 Jul 2016 19:52:01 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7423=20-=20Corre=C3=A7=C3=A3o=20?=
 =?UTF-8?q?de=20erro=20ao=20ordernar=20por=20data=20de=20pagamento=20e=20c?=
 =?UTF-8?q?orre=C3=A7=C3=A3o=20de=20layout.?=
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@57725 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioOCDNaoResgatadaEmpresa.java |   2 +-
 .../RelatorioOCDNaoResgatadaEmpresa.jasper    | Bin 39561 -> 39564 bytes
 .../RelatorioOCDNaoResgatadaEmpresa.jrxml     |  10 +++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java
index 379c25a94..a0af1041b 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java
@@ -137,7 +137,7 @@ public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio {
 			sql.append(" b.feccreacion ");
 			break;
 		case FECHA_PAGAMENTO:
-			sql.append(" b.feccorte ");
+			sql.append(" o.fecpago ");
 			break;
 		default:
 			sql.append(" o.boleto_id ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jasper
index 1aa878bbd4cd9853aaaeec95d6de99e6d4d878e3..209a47f5611abadf0c8e42b7b9726db55f617590 100644
GIT binary patch
delta 145
zcmeC&%G9%!X@jB&qu^#Gk^h2|{S~-a0~i<>d?p)+h)#Z>F0wgNt;0f#+0fjmkfDz0
zQ3->Pk)EN6v8jcHg`oi$7@C1(9+xmM8=4wbOkQWMz1cWEM_9np$iURn)WFCv-pta>
f$jp56`l6}o!swzU3`Ua;*<~iLF65kCGm94hQZ^^D

delta 164
zcmeC#%G9})X@jE3<PdM6&Bh|{1cikd7#ScS07&`#2ZG6kvZ|XS)jBNHnT(7I8S0oG
zl`sey>KPjw8Xy4^kj&!}21bL5$?MFuH=D)h2#c8+n;V&$ni?C%8yZ<!SX!_%Ffuae
kOfF=VnY^xwee><29CcxIH6;v2lMUH{3JN(V*U#bw0Hba#5&!@I

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jrxml
index c7ca9eec5..eef2a6561 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jrxml
@@ -1,8 +1,8 @@
 <?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="0"/>
-	<property name="ireport.y" value="22"/>
+	<property name="ireport.zoom" value="2.1435888100000016"/>
+	<property name="ireport.x" value="152"/>
+	<property name="ireport.y" value="172"/>
 	<parameter name="fecInicio" class="java.lang.String">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
 	</parameter>
@@ -200,7 +200,7 @@
 	<detail>
 		<band height="26" splitType="Stretch">
 			<textField>
-				<reportElement uuid="0581d767-ed09-4cfd-aad4-47f62bec1404" x="0" y="0" width="76" height="18"/>
+				<reportElement uuid="0581d767-ed09-4cfd-aad4-47f62bec1404" x="0" y="0" width="76" height="17"/>
 				<textElement textAlignment="Left" markup="none">
 					<font size="8"/>
 				</textElement>
@@ -249,7 +249,7 @@
 				<textFieldExpression><![CDATA[$F{fecpagar}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="a1875870-b2d4-403d-abd0-2a4bc9a68e63" x="76" y="-1" width="80" height="18"/>
+				<reportElement uuid="a1875870-b2d4-403d-abd0-2a4bc9a68e63" x="76" y="0" width="80" height="17"/>
 				<textElement textAlignment="Left" markup="none">
 					<font size="8"/>
 				</textElement>