From 96aee572443793d7d2a7c64c1c82c771e51dd32e Mon Sep 17 00:00:00 2001 From: wilian Date: Tue, 19 Jan 2021 19:53:17 +0000 Subject: [PATCH] fixes bug#21424 dev:valdir qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@105065 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...ioFinanceiroReceitasDespesasAgencia.jasper | Bin 35396 -> 34551 bytes ...rioFinanceiroReceitasDespesasAgencia.jrxml | 70 ++++++++++-------- ...rioFinanceiroReceitasDespesasEvento.jasper | Bin 35549 -> 34707 bytes ...orioFinanceiroReceitasDespesasEvento.jrxml | 68 +++++++++-------- ...oFinanceiroReceitasDespesasController.java | 15 ++++ web/WEB-INF/i3-label_es_MX.label | 3 + web/WEB-INF/i3-label_pt_BR.label | 3 + ...troRelatorioFinanceiroReceitasDespesas.zul | 17 ++++- 8 files changed, 114 insertions(+), 62 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasAgencia.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasAgencia.jasper index ec295cb9cc57cbda471d20a0dc020afa95c53863..f65c128cb2ba741e461e53a8d33b569262777671 100644 GIT binary patch literal 34551 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

#=p#W^RMvp z_*eNQd=E-}gI~>WLC$UbCjM=HGyg7Pd-?7B`}{8ayO;lfKgRFlkMoE4v;1NH9KOB8 ze*`J@Q%I>NAf=vylzJLc>KBkwzl4i3XRuR=;4gp_(6QtD5T zQg1;@{S8v;?~qdOK}!9@coIL<_pZT>_lRQZ+} zQ+&&f>AsVV8NSuV;l8!TJV>dI|Cdt#6Djq7QJ30Kh?Ls!Zz81#kN-_6MQX7lrSJ_R z-;z@5o03wJYz0Xvqm~)QQg)-UoP85Jh}(=4*`3BJcDHdVd)QdberPnZ{YH>I4cGGD z;0HKgFk0AaMk_mLMA%=A4)(Tj2Is~`USxa(+RaCKxzWw18$Hly`gyZ4z}t*C-)#)? z^Ng+h5+lVgH@5MsjqUt8<750L<7|Gj@dOV4 zal3Jyu@5=lGrnQmZR|DfG43?($G-=Rhm1#zCyYlSrG5-4^*E%|&mg7tLrOgZDfM$m zsplZ2eg!FY08;7&NU4`0rCx!QdJR(QPmoe)K>vgpFToxz diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasAgencia.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasAgencia.jrxml index fe0341503..d8ee01f35 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasAgencia.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasAgencia.jrxml @@ -1,7 +1,7 @@ - + @@ -24,63 +24,69 @@ - + - + - + + - + - + + - + - + + - + + - + + - + + - + - + - + @@ -98,55 +104,57 @@ - + - + - + - + - + - + + - + - + + - + @@ -161,16 +169,18 @@ - + - + + - + + @@ -184,17 +194,17 @@

- + - + - + @@ -205,7 +215,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasEvento.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasEvento.jasper index 115a473765b718c599c8fd90f2f300aaf95d467d..346700349113c7b66fc0d58ee108710f94737c45 100644 GIT binary patch literal 34707 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasEvento.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasEvento.jrxml index 25d370325..9c2351472 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasEvento.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasEvento.jrxml @@ -25,44 +25,49 @@ - + - + - + - + - + + - + + - + - + + - + + - + + @@ -70,14 +75,14 @@ - + - + @@ -95,55 +100,57 @@ - + - + - + - + - + + - + - + - + + - + @@ -158,20 +165,23 @@ - + - + + - + + - + + @@ -185,17 +195,17 @@ - + - + - + @@ -206,7 +216,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioFinanceiroReceitasDespesasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioFinanceiroReceitasDespesasController.java index 399fde300..e3139cd0c 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioFinanceiroReceitasDespesasController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioFinanceiroReceitasDespesasController.java @@ -76,12 +76,16 @@ public class RelatorioFinanceiroReceitasDespesasController extends MyGenericForw private Radio rSintetico; private Radio rAgencia; private Radio rEvento; + + private Radio rDataVenda; + private Radio rDataFechamentoCaixa; @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa(); cmbIndTipo.setSelectedIndex(0); + rDataVenda.setChecked(true); } public void onClick$btnExecutarRelatorio(Event ev) throws Exception { @@ -89,6 +93,17 @@ public class RelatorioFinanceiroReceitasDespesasController extends MyGenericForw Map parametros = new HashMap(); StringBuilder sbFiltros = new StringBuilder(); + parametros.put("isDataFechamentoCaixa", rDataFechamentoCaixa.isChecked()); + sbFiltros.append(Labels.getLabel("relatorioFinanceiroReceitasDespesasController.lb.filtrarData")); + if(rDataFechamentoCaixa.isChecked()) { + sbFiltros.append(": ") + .append(Labels.getLabel("relatorioFinanceiroReceitasDespesasController.lb.dataFechamentoCaixa")); + } else { + sbFiltros.append(": ") + .append(Labels.getLabel("relatorioFinanceiroReceitasDespesasController.lb.filtrarData")); + } + sbFiltros.append("; "); + String formatoData = "dd/MM/yyyy HH:mm"; String formatoDataFiltro = "dd/MM/yyyy"; if(dataInicial.getValue() != null) { diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index aa84d1c79..e340f1c0c 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -7911,6 +7911,9 @@ relatorioFinanceiroReceitasDespesasController.lb.agencia = Por Agência relatorioFinanceiroReceitasDespesasController.lb.evento = Por Evento relatorioFinanceiroReceitasDespesasController.lbEventoExtra.value = Evento relatorioFinanceiroReceitasDespesasController.lbNumDocumento.value=Nº Documento +relatorioFinanceiroReceitasDespesasController.lb.filtrarData = Fecha del Filtro +relatorioFinanceiroReceitasDespesasController.lb.dataVenda = Fecha venta +relatorioFinanceiroReceitasDespesasController.lb.dataFechamentoCaixa = Fecha corte turno # Relatório CNAB indexController.mniRelatorioRemessaCNAB.label = Remessa de Lote (CNAB 400) diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index b59e47847..1a7986d67 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -8402,6 +8402,9 @@ relatorioFinanceiroReceitasDespesasController.lb.agencia = Por Agência relatorioFinanceiroReceitasDespesasController.lb.evento = Por Evento relatorioFinanceiroReceitasDespesasController.lbEventoExtra.value = Evento relatorioFinanceiroReceitasDespesasController.lbNumDocumento.value=Nº Documento +relatorioFinanceiroReceitasDespesasController.lb.filtrarData = Data do Filtro +relatorioFinanceiroReceitasDespesasController.lb.dataVenda = Data da Venda +relatorioFinanceiroReceitasDespesasController.lb.dataFechamentoCaixa = Data do Fechamento do Caixa #Auditoria auditoriaController.window.title = Auditoria diff --git a/web/gui/relatorios/filtroRelatorioFinanceiroReceitasDespesas.zul b/web/gui/relatorios/filtroRelatorioFinanceiroReceitasDespesas.zul index f3603813e..8593b29e3 100644 --- a/web/gui/relatorios/filtroRelatorioFinanceiroReceitasDespesas.zul +++ b/web/gui/relatorios/filtroRelatorioFinanceiroReceitasDespesas.zul @@ -18,12 +18,12 @@ + + + +