From 14aa6e81d8f84da895f08b108de4f10307093473 Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 1 Aug 2024 18:42:04 -0300 Subject: [PATCH 1/2] correcao nazar --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 18c36f9af..d80865e50 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.118.0 + 1.118.1 war 1.90.0 - 1.77.0 + 1.77.1 UTF-8 From 479700c1e2b3c6cd877b58dea94615bdcd3c8f84 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Fri, 2 Aug 2024 08:50:28 -0300 Subject: [PATCH 2/2] fixes bug#AL-4487 --- pom.xml | 2 +- .../RelatorioTaxasLinhaPorDataEmissao.jasper | Bin 73576 -> 73729 bytes .../RelatorioTaxasLinhaPorDataEmissao.jrxml | 70 +++++++++++++----- 3 files changed, 53 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index d80865e50..cb97d6c27 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.118.1 + 1.118.2 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinhaPorDataEmissao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinhaPorDataEmissao.jasper index 673086bb25faaec812cf1ae829ce4bebb42630cd..9db795e0aa61e130527a182ddfc937d7e981ae37 100644 GIT binary patch delta 11692 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 aDG^C5acJb|S^S%z`oh&sEh`%v*8Ux>dgQMF diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinhaPorDataEmissao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinhaPorDataEmissao.jrxml index 8b870313c..d8b84a020 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinhaPorDataEmissao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinhaPorDataEmissao.jrxml @@ -536,7 +536,7 @@ - + @@ -549,115 +549,149 @@ - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + +