From 3e55894d89dc40da0563e442e6580af85d0116b3 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Mon, 29 May 2023 18:04:20 -0300 Subject: [PATCH] fixes bug#AL-2691 --- pom.xml | 2 +- .../templates/RelatorioOrigemDestino.jasper | Bin 77229 -> 78469 bytes .../templates/RelatorioOrigemDestino.jrxml | 483 +++++++++++++----- 3 files changed, 343 insertions(+), 142 deletions(-) diff --git a/pom.xml b/pom.xml index 950a42ac0..47eeabbf6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.6.3 + 1.6.4 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper index 413c05002aa36111e91ad08dfae188d3274f12b2..5c0d174e96833eb5f9ce152ddd2ff4e345c81a54 100644 GIT binary patch delta 22272 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 mg359-RC#okQfw6KxG&e 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 - + - + @@ -106,172 +106,222 @@ - + + - + - + - + - + + - + - + - + - + + + + - + - + + + + - + - + + + + - + - + + + + - + - + + + + - + - + + + + - + - + + + + - + - + + + + - + + + + - + + + + - + + + + - + + + + - - - - - - - - - - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + - + - + - + - + + + + @@ -280,179 +330,180 @@ - + - + - + - - - - + - + - + - + - + - + - + - + 0?new BigDecimal("100.00"):$V{sum_por_equivalente}]]> - + - + 0?new BigDecimal("100.00"):$V{sum_porc_abs}]]> - - - + + + + - + + - + + - + + - + + - + + - + - + - + - + - + - + - + - + - - - - + + - + - + - + - + @@ -469,89 +520,118 @@ - + + + + - + + + + - + + + + - + + + + - + + + + + + + + + + + + + - + + - + - + - + + - + - + - + - - + + + + - + + @@ -621,20 +701,24 @@ - + - + - - + + + + - - + + + + @@ -645,70 +729,187 @@ - - + + + + + + + + + + + - - - - - - - + + + + + + + + + + + - - + + + + + + + + + + + - - - - - - - + + + + + + + + + + + - - + + + + + + + + + + + - - + + + + + + + + + + + - - + + + + + + + + + + + - - + + + + + + + + + + + - + + + + + + + + + + - - + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +