From f70c649d49884ead9081c25c7bbfeaf070e222c4 Mon Sep 17 00:00:00 2001 From: luis.camargo Date: Fri, 1 Apr 2016 17:29:07 -0300 Subject: [PATCH] redmine #4115 Correções --- cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml | 322 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------- cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------- 2 files changed, 322 insertions(+), 286 deletions(-) diff --git a/cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml index 345936a..29f5846 100644 --- a/cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml +++ b/cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml @@ -233,161 +233,179 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d - - - + + - - - - - - + + + + + + + + + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml index 0f89a40..4e661de 100644 --- a/cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml +++ b/cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml @@ -175,7 +175,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d - + @@ -197,165 +197,183 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d - - - - - + + - - - - - - + + + + + + + + + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + -- libgit2 0.21.2