From 25998911bf750270e49449b0cb3d44b0ab3868cd Mon Sep 17 00:00:00 2001 From: fabio Date: Thu, 26 Oct 2017 19:43:05 +0000 Subject: [PATCH] Fixes bug #9774 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@75747 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...ioFinanceiroReceitasDespesas_es.properties | 46 +++++++----- ...inanceiroReceitasDespesas_pt_BR.properties | 46 +++++++----- ...RelatorioFinanceiroReceitasDespesas.jasper | Bin 33643 -> 37895 bytes .../RelatorioFinanceiroReceitasDespesas.jrxml | 70 ++++++++++++++---- .../comissao/ConferenciaController.java | 3 - 5 files changed, 109 insertions(+), 56 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroReceitasDespesas_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroReceitasDespesas_es.properties index 007133c05..5750e215a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroReceitasDespesas_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroReceitasDespesas_es.properties @@ -1,23 +1,29 @@ +#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) #geral -msg.noData=Não foi possivel obter dados com os parâmetros informados. +cabecalho.dataHora = Data/Hora: +cabecalho.de = de +cabecalho.empresa = Empresa: +cabecalho.filtros = Filtros: +cabecalho.impressorPor = Impressor por: #Labels cabeçalho -cabecalho.nome=Relatório Financeiro de Receitas e Despesas -cabecalho.relatorio=Relatório: -cabecalho.periodo=Período: -cabecalho.periodoA=à -cabecalho.dataHora=Data/Hora: -cabecalho.impressorPor=Impressor por: -cabecalho.pagina=Página -cabecalho.de=de -cabecalho.filtros=Filtros: -cabecalho.usuario=Usuário: -cabecalho.filtros=Filtros: -cabecalho.empresa=Empresa: -label.data=Data -label.agenciaCodigo=Num. da Agência -label.agenciaDescricao=Nome da Agência -label.operacaoCodigo=Código da Operação -label.operacaoDescricao=Descrição da Operação -label.valor=Valor -label.total=Total \ No newline at end of file +cabecalho.nome = Relat\u00F3rio Financeiro de Receitas e Despesas +cabecalho.pagina = P\u00E1gina +cabecalho.periodo = Per\u00EDodo: +cabecalho.periodoA = \u00E0 +cabecalho.relatorio = Relat\u00F3rio: +cabecalho.usuario = Usu\u00E1rio: + +label.agenciaCodigo = Num. da Ag\u00EAncia +label.agenciaDescricao = Nome da Ag\u00EAncia +label.data = Data +label.formaPagamento = Forma Pagamento +label.numero = Numero +label.numeroDocumento = Num. Documento +label.operacaoCodigo = C\u00F3digo da Opera\u00E7\u00E3o +label.operacaoDescricao = Descri\u00E7\u00E3o da Opera\u00E7\u00E3o +label.serie = Serie +label.total = Total +label.valor = Valor + +msg.noData = N\u00E3o foi possivel obter dados com os par\u00E2metros informados. diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroReceitasDespesas_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroReceitasDespesas_pt_BR.properties index 007133c05..5750e215a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroReceitasDespesas_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroReceitasDespesas_pt_BR.properties @@ -1,23 +1,29 @@ +#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) #geral -msg.noData=Não foi possivel obter dados com os parâmetros informados. +cabecalho.dataHora = Data/Hora: +cabecalho.de = de +cabecalho.empresa = Empresa: +cabecalho.filtros = Filtros: +cabecalho.impressorPor = Impressor por: #Labels cabeçalho -cabecalho.nome=Relatório Financeiro de Receitas e Despesas -cabecalho.relatorio=Relatório: -cabecalho.periodo=Período: -cabecalho.periodoA=à -cabecalho.dataHora=Data/Hora: -cabecalho.impressorPor=Impressor por: -cabecalho.pagina=Página -cabecalho.de=de -cabecalho.filtros=Filtros: -cabecalho.usuario=Usuário: -cabecalho.filtros=Filtros: -cabecalho.empresa=Empresa: -label.data=Data -label.agenciaCodigo=Num. da Agência -label.agenciaDescricao=Nome da Agência -label.operacaoCodigo=Código da Operação -label.operacaoDescricao=Descrição da Operação -label.valor=Valor -label.total=Total \ No newline at end of file +cabecalho.nome = Relat\u00F3rio Financeiro de Receitas e Despesas +cabecalho.pagina = P\u00E1gina +cabecalho.periodo = Per\u00EDodo: +cabecalho.periodoA = \u00E0 +cabecalho.relatorio = Relat\u00F3rio: +cabecalho.usuario = Usu\u00E1rio: + +label.agenciaCodigo = Num. da Ag\u00EAncia +label.agenciaDescricao = Nome da Ag\u00EAncia +label.data = Data +label.formaPagamento = Forma Pagamento +label.numero = Numero +label.numeroDocumento = Num. Documento +label.operacaoCodigo = C\u00F3digo da Opera\u00E7\u00E3o +label.operacaoDescricao = Descri\u00E7\u00E3o da Opera\u00E7\u00E3o +label.serie = Serie +label.total = Total +label.valor = Valor + +msg.noData = N\u00E3o foi possivel obter dados com os par\u00E2metros informados. diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesas.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesas.jasper index 4a0834cc1ac931883d69061d32f1aa207eac4e1c..d97f054d850b4ef52a14cadf0b9e6d0b6998a4af 100644 GIT binary patch literal 37895 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 F{{fURmmUBB delta 10418 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesas.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesas.jrxml index b877fb476..c551ce278 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesas.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesas.jrxml @@ -1,12 +1,12 @@ - + - + - + @@ -24,6 +24,10 @@ + + + + @@ -36,46 +40,46 @@ - + - + - + - + - + - + - + @@ -84,7 +88,7 @@ - + @@ -100,7 +104,7 @@ - + @@ -124,6 +128,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -154,6 +178,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -172,7 +216,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java index 1a9e9737c..db5ba9acc 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java @@ -212,9 +212,6 @@ public class ConferenciaController extends MyGenericForwardComposer { @Override public void doAfterCompose(Component comp) throws Exception { - conferenciaComissaoService.generacionAutomaticaConferencia(); - - isPeriodo = (Boolean) Executions.getCurrent().getArg().get("isPeriodo"); if (isPeriodo) {