From 545c0fbc2d05239647b98c46bca50c72e7cbd5e1 Mon Sep 17 00:00:00 2001
From: luis.camargo <luis.camargo@centralit.com.br>
Date: Fri, 1 Apr 2016 15:47:09 -0300
Subject: [PATCH] redmine #4115 Correções

---
 cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml | 4 ++--
 cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml
index 5de712f..9f3acec 100644
--- a/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml
+++ b/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml
@@ -60,10 +60,10 @@ where c.id = $P{CONTRATO_ID} $P!{DATA_INICIAL_TOKEN} $P!{DATA_FINAL_TOKEN};]]>
 	<parameter name="DATA_INICIAL" class="java.util.Date"/>
 	<parameter name="DATA_FINAL" class="java.util.Date"/>
 	<parameter name="DATA_FINAL_TOKEN" class="java.lang.String">
-		<defaultValueExpression><![CDATA[( $P{DATA_FINAL} != null ? " and p.datapenalizacao <= '" + $P{DATA_FINAL} + "'" : "" )]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA[( $P{DATA_FINAL} != null ? " and lp.emissao <= '" + $P{DATA_FINAL} + "'" : "" )]]></defaultValueExpression>
 	</parameter>
 	<parameter name="DATA_INICIAL_TOKEN" class="java.lang.String">
-		<defaultValueExpression><![CDATA[( $P{DATA_INICIAL} != null ? " and p.datapenalizacao >= '" + $P{DATA_INICIAL} + "'" : "" )]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA[( $P{DATA_INICIAL} != null ? " and lp.emissao >= '" + $P{DATA_INICIAL} + "'" : "" )]]></defaultValueExpression>
 	</parameter>
 	<queryString>
 		<![CDATA[select c.numeroanocontrato as numanocontrato, pess.nome as contratada
diff --git a/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml
index c4a170b..e08d90e 100644
--- a/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml
+++ b/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml
@@ -52,10 +52,10 @@ where c.id = $P{CONTRATO_ID} $P!{DATA_INICIAL_TOKEN} $P!{DATA_FINAL_TOKEN}]]>
 	<parameter name="DATA_INICIAL" class="java.util.Date"/>
 	<parameter name="DATA_FINAL" class="java.util.Date"/>
 	<parameter name="DATA_FINAL_TOKEN" class="java.lang.String">
-		<defaultValueExpression><![CDATA[( $P{DATA_FINAL} != null ? " and p.datapenalizacao <= '" + $P{DATA_FINAL} + "'" : "" )]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA[( $P{DATA_FINAL} != null ? " and r.datarepactuacao <= '" + $P{DATA_FINAL} + "'" : "" )]]></defaultValueExpression>
 	</parameter>
 	<parameter name="DATA_INICIAL_TOKEN" class="java.lang.String">
-		<defaultValueExpression><![CDATA[( $P{DATA_INICIAL} != null ? " and p.datapenalizacao >= '" + $P{DATA_INICIAL} + "'" : "" )]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA[( $P{DATA_INICIAL} != null ? " and r.datarepactuacao >= '" + $P{DATA_INICIAL} + "'" : "" )]]></defaultValueExpression>
 	</parameter>
 	<queryString>
 		<![CDATA[select c.numeroanocontrato as numanocontrato, pess.nome as contratada
--
libgit2 0.21.2