From f9ca6854a6a477eb44ba39286d7be894a81594c7 Mon Sep 17 00:00:00 2001 From: wilian Date: Wed, 7 Jun 2017 19:12:45 +0000 Subject: [PATCH] fixes bug #9166 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@69736 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioDepositos.java | 14 +- .../RelatorioDepositos_es .properties | 3 +- .../RelatorioDepositos_pt_BR.properties | 1 + .../templates/RelatorioDepositos.jasper | Bin 36508 -> 38120 bytes .../templates/RelatorioDepositos.jrxml | 268 +++++++++++------- .../utilitarios/RelatorioDepositoBean.java | 9 +- .../utilerias/menu/menu_original.properties | 3 + web/WEB-INF/i3-label_es_MX.label | 2 +- web/WEB-INF/i3-label_pt_BR.label | 2 +- 9 files changed, 192 insertions(+), 110 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java index 643e92249..cc014398d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java @@ -60,11 +60,12 @@ public class RelatorioDepositos extends Relatorio { RelatorioDepositoBean deposito = new RelatorioDepositoBean(); deposito.setNombempresa(rs.getString(1)); deposito.setNombpuntoventa(rs.getString(2)); - deposito.setDtmotivo(rs.getDate(3)); - deposito.setSaldo(rs.getBigDecimal(4).multiply(BigDecimal.valueOf(-1))); - deposito.setVrdeposito(rs.getBigDecimal(5)); - deposito.setVrfechamento(rs.getBigDecimal(6)); - deposito.setNumdeposito(rs.getString(7)); + deposito.setNumpuntoventa(rs.getString(3)); + deposito.setDtmotivo(rs.getDate(4)); + deposito.setSaldo(rs.getBigDecimal(5).multiply(BigDecimal.valueOf(-1))); + deposito.setVrdeposito(rs.getBigDecimal(6)); + deposito.setVrfechamento(rs.getBigDecimal(7)); + deposito.setNumdeposito(rs.getString(8)); lsDadosRelatorio.add(deposito); } @@ -94,6 +95,7 @@ public class RelatorioDepositos extends Relatorio { sql.append(" SELECT DISTINCT tmp.nombempresa, "); sql.append(" tmp.nombpuntoventa, "); + sql.append(" tmp.numpuntoventa, "); sql.append(" tmp.dtmotivo, "); sql.append(" tmp.saldo, "); sql.append(" tmp.vrfechamento, "); @@ -110,6 +112,7 @@ public class RelatorioDepositos extends Relatorio { sql.append(" FROM "); sql.append(" ( SELECT DISTINCT e.nombempresa, "); sql.append(" p.nombpuntoventa, "); + sql.append(" p.numpuntoventa, "); sql.append(" f.fecfechamento AS dtmotivo, "); sql.append(" ( SUM(NVL(fd.valor_pago,0)) - f.total ) AS saldo, "); sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrfechamento , "); @@ -135,6 +138,7 @@ public class RelatorioDepositos extends Relatorio { sql.append(" GROUP BY e.nombempresa, "); sql.append(" p.nombpuntoventa, "); + sql.append(" p.numpuntoventa, "); sql.append(" f.fecfechamento, "); sql.append(" fd.FECHAMENTOCNTCORRENTE_ID, "); sql.append(" f.total ) tmp "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_es .properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_es .properties index dca84360d..13bb7fa2f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_es .properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_es .properties @@ -16,4 +16,5 @@ header.saldo=Pendente header.vrdeposito=Vr. Depósito header.vrfechamento=Vr. Fechamento header.usuario=Usuário -header.numdeposito=Num. Depósito \ No newline at end of file +header.numdeposito=Num. Depósito +header.numeroAgencia=Número \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_pt_BR.properties index a53af997b..410d3bb32 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_pt_BR.properties @@ -17,3 +17,4 @@ header.vrdeposito=Vr. Dep header.vrfechamento=Vr. Fechamento header.usuario=Usuário header.numdeposito=Num. Depósito +header.numeroAgencia=Número diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper index f21df8bb8a483d1f81109909c248ef2381b1fc46..2a6d068c2a57c4e2e3c080572718d4ae3936473a 100644 GIT binary patch literal 38120 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 literal 36508 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 - - - - + + + + @@ -18,6 +18,7 @@ + @@ -32,79 +33,98 @@ - + - - + + + - + - - + + + - + - - + + + - + - + - + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - + - - + + + - + - + + + + + + + + + + + + @@ -114,156 +134,202 @@ - - + + + - + - - - + + + + + - - - + + + + + - - - + + + + + - - - + + + + + - - - + + + + + - - - + + + + + - - - + + + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - + - + - + - + - + + + + + + + + + + + + - - + + + + - - - + + + + + - - + + + + - - - + + + + + - - + + + + - - - + + + + + - - - + + + + + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java index 0b24b7b13..b186e40e5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java @@ -11,6 +11,7 @@ public class RelatorioDepositoBean { private BigDecimal vrfechamento; private Date dtmotivo; private String numdeposito; + private String numpuntoventa; public String getNombpuntoventa() { return nombpuntoventa; @@ -53,6 +54,12 @@ public class RelatorioDepositoBean { } public void setNumdeposito(String numdeposito) { this.numdeposito = numdeposito; - } + } + public String getNumpuntoventa() { + return numpuntoventa; + } + public void setNumpuntoventa(String numpuntoventa) { + this.numpuntoventa = numpuntoventa; + } } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties index 3a4695a43..b158a9896 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties @@ -163,6 +163,9 @@ analitico.gerenciais.financeiro.conferenciaMovimento=com.rjconsultores.ventabole analitico.gerenciais.financeiro.eventos=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioObservacaoEventosFinanceiros analitico.gerenciais.financeiro.observacaoBilhetes=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioObservacaoBilhetes analitico.gerenciais.financeiro.relatorioFinanceiroReceitasDespesas=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioFinanceiroReceitasDespesas +analitico.gerenciais.financeiro.relatorioDepositos=com.rjconsultores.ventaboletos.web.utilerias.menu.item.contacorrente.ItemMenuRelatorioDepositos +analitico.gerenciais.financeiro.relatorioDepositosDetalhados=com.rjconsultores.ventaboletos.web.utilerias.menu.item.contacorrente.ItemMenuRelatorioDepositosDetalhados +analitico.gerenciais.financeiro.relatorioPosicaoCaixaAnalitico=com.rjconsultores.ventaboletos.web.utilerias.menu.item.contacorrente.ItemMenuRelatorioPosicaoCaixaAnalitico analitico.gerenciais.pacote=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.gerenciais.pacote.SubMenuRelatorioPacote analitico.gerenciais.pacote.boletos=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioVendasPacotesBoletos analitico.gerenciais.pacote.detalhado=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioVendasPacotesDetalhado diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 169f8922e..51fbb59c4 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -326,7 +326,7 @@ indexController.mniPracaPedagio.label = Caseta Peaje indexController.mniRelatorioDescontos.label = Descuentos indexController.mniRelatorioDepositos.label=Cierre Cnt Contábil / Depósitos indexController.mniRelatorioDepositosDetalhados.label= Depósitos Detallados -indexController.mniRelatorioPosicaoCaixaAnalitico.label= Relatório de Numeração Lógica +indexController.mniRelatorioPosicaoCaixaAnalitico.label= Numeração Lógica relatorioPosicaoCaixaAnaliticoController.lbPuntoVenta.value=Punto de Venta relatorioPosicaoCaixaAnaliticoController.lbEmpresa.value=Empresa relatorioPosicaoCaixaAnaliticoController.lbNumero.value=Numero punto de venta diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 833d6a588..bd7378c87 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -333,7 +333,7 @@ indexController.mniPracaPedagio.label = Praça Pedágio indexController.mniRelatorioDescontos.label = Vendas com Desconto indexController.mniRelatorioDepositos.label=Fechamento Cnt Corrente / Depósitos indexController.mniRelatorioDepositosDetalhados.label=Depósitos Detalhados -indexController.mniRelatorioPosicaoCaixaAnalitico.label=Relatório de Numeração Lógica +indexController.mniRelatorioPosicaoCaixaAnalitico.label=Numeração Lógica relatorioPosicaoCaixaAnaliticoController.lbPuntoVenta.value=Ponto de Venda relatorioPosicaoCaixaAnaliticoController.lbEmpresa.value=Empresa relatorioPosicaoCaixaAnaliticoController.lbNumero.value=Número Ponto de Venda