From ad0f0f5df747caa07cba356fc6f965a797fdbb04 Mon Sep 17 00:00:00 2001 From: "eduardo.dicarde" Date: Fri, 29 Jul 2016 19:06:29 +0000 Subject: [PATCH] fixes bug #7772 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@58585 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioReceitaEmbarcadaServico.jasper | Bin 51090 -> 56464 bytes .../RelatorioReceitaEmbarcadaServico.jrxml | 85 +++++++++++++++++- 2 files changed, 82 insertions(+), 3 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaEmbarcadaServico.jasper index 01b323656d6753bed212c734c5506e70e18f2015..9d65e8b3fa6e0a12249df634123c5a9c446cc356 100644 GIT binary patch delta 14745 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 RSp18eT=B;f_{&@8{{aWxpQZo+ delta 11178 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 - - + + @@ -45,6 +45,22 @@ + + + + + + + + + + + + + + + + @@ -529,7 +545,70 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +