From aad3098bd5075eb3e5479f61b3498d2169db7f77 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Thu, 11 Apr 2024 17:07:30 -0300 Subject: [PATCH] fixes bug#AL-3947 --- pom.xml | 2 +- .../templates/RelatorioReceitaServico.jasper | Bin 46835 -> 46927 bytes .../templates/RelatorioReceitaServico.jrxml | 4 ++-- web/gui/catalogos/busquedaCategoria.zul | 10 +++++----- .../filtroRelatorioResumoLinhas.zul | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index e1c6a9a84..ae8fc1a22 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.63.1 + 1.63.2 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper index a691680753fb53c018a5dd76d4856b84b4e5a507..b34b94c2fee1d04e4ab2a6437454fc58fc890661 100644 GIT binary patch delta 9109 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 S?w)(KbXm4Alf3o%`u_vGccd-= delta 9513 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml index 3f639cd42..aa80b2185 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml @@ -406,8 +406,8 @@ - - + + diff --git a/web/gui/catalogos/busquedaCategoria.zul b/web/gui/catalogos/busquedaCategoria.zul index 99f72df41..bf24afd55 100644 --- a/web/gui/catalogos/busquedaCategoria.zul +++ b/web/gui/catalogos/busquedaCategoria.zul @@ -7,7 +7,7 @@ + height="500px" width="700px" border="normal" >