From 2a65962797f539b63a34bf9c2f0f3df6d4730c56 Mon Sep 17 00:00:00 2001 From: bruno Date: Thu, 25 Jul 2013 15:02:39 +0000 Subject: [PATCH] - Ajustes RDA e RRL git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@29457 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioReceitaDiariaAgencia.java | 16 +- .../RelatorioReceitaDiariaAgencia.jasper | Bin 73682 -> 73708 bytes .../RelatorioReceitaDiariaAgencia.jrxml | 393 +++++++++--------- web/WEB-INF/i3-label_pt_BR.label | 3 +- .../filtroRelatorioResumoLinhas.zul | 15 +- 5 files changed, 216 insertions(+), 211 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java index 5b09b01e7..2edac8204 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java @@ -370,8 +370,7 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio { mapCacheConfigComissao.put(puntoVentaId.toString() + "_" + empresaId.toString(), cacheConfig); - rs.close(); - stmt.close(); + } else { @@ -395,6 +394,9 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio { rsParam.close(); stmtParam.close(); } + + rs.close(); + stmt.close(); } else @@ -470,12 +472,12 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio { } - rs.close(); - stmt.close(); + - } - else { - } + }; + rs.close(); + stmt.close(); + } else cacheConfig = mapCacheConfigImposto.get(puntoVentaId.toString()); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaDiariaAgencia.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaDiariaAgencia.jasper index 9f196f34f17ac42fb6fa6b8d47600768fa009b94..378f734deaa4b783b557aad46f7b231475bcc189 100644 GIT binary patch delta 18057 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 agA_dsYCj(kIp4b0x?+~&5vQ%O-u3@a{Pr;b delta 18375 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 Dly*?< diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaDiariaAgencia.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaDiariaAgencia.jrxml index 068405b07..aab14495f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaDiariaAgencia.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaDiariaAgencia.jrxml @@ -1,8 +1,8 @@ - - - + + +