From e6bdee09bfec7e594b9183e7232741ba29a0b685 Mon Sep 17 00:00:00 2001 From: frederico Date: Fri, 10 Jun 2016 14:11:47 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7437=20-=20Relat=C3=B3rio=20Nume?= =?UTF-8?q?ra=C3=A7=C3=A3o=20L=C3=B3gica:=20adi=C3=A7=C3=A3o=20'Total=20In?= =?UTF-8?q?termedi=C3=A1ria'=20e=20'Total=20Ag=C3=AAncia'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@56867 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...orioPosicaoCaixaAnalitico_es_MX.properties | 2 + ...orioPosicaoCaixaAnalitico_pt_BR.properties | 2 + .../RelatorioPosicaoCaixaAnalitico.jasper | Bin 42507 -> 45413 bytes .../RelatorioPosicaoCaixaAnalitico.jrxml | 48 +++++++++++++++--- 4 files changed, 45 insertions(+), 7 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioPosicaoCaixaAnalitico_es_MX.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioPosicaoCaixaAnalitico_es_MX.properties index 8cce83ab0..83a32a5bd 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioPosicaoCaixaAnalitico_es_MX.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioPosicaoCaixaAnalitico_es_MX.properties @@ -27,4 +27,6 @@ pedagio.label=PEDAGIO seguro.label=SEGURO total.label=TOTAL totalGeral.label=TOTAL GERAL: +totalIntermediaria.label=TOTAL INTERMEDIÁRIA: +totalAgencia.label=TOTAL AGÊNCIA: serie.label=SÉRIE \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioPosicaoCaixaAnalitico_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioPosicaoCaixaAnalitico_pt_BR.properties index 8cce83ab0..83a32a5bd 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioPosicaoCaixaAnalitico_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioPosicaoCaixaAnalitico_pt_BR.properties @@ -27,4 +27,6 @@ pedagio.label=PEDAGIO seguro.label=SEGURO total.label=TOTAL totalGeral.label=TOTAL GERAL: +totalIntermediaria.label=TOTAL INTERMEDIÁRIA: +totalAgencia.label=TOTAL AGÊNCIA: serie.label=SÉRIE \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPosicaoCaixaAnalitico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPosicaoCaixaAnalitico.jasper index b97632d3b6922087bdc22a1b7373178a5ce4da02..c61419ecf917e58b9d9c3a65c873cd3890148934 100644 GIT binary patch delta 13388 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 J`Q^ji{s%rDjidko delta 10868 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 - - - + + + @@ -24,6 +24,12 @@ + + + + + + @@ -315,21 +321,49 @@ - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +