From f19a7eb1644a297a37c6645a8bfe8194553cb8bd Mon Sep 17 00:00:00 2001 From: fabio Date: Wed, 23 Mar 2022 21:45:37 +0000 Subject: [PATCH] fixes bug#24091 dev: Celio qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@111466 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioCteos.java | 2 +- .../RelatorioCteos_es.properties | 2 +- .../RelatorioCteos_pt_BR.properties | 2 +- .../templates/RelatorioCteos.jasper | Bin 40806 -> 40873 bytes .../relatorios/templates/RelatorioCteos.jrxml | 4 ++-- .../relatorios/RelatorioCteosController.java | 2 +- .../relatorios/ItemMenuRelatorioCteos.java | 2 +- web/WEB-INF/i3-label_en.label | 2 +- web/WEB-INF/i3-label_es_MX.label | 2 +- web/WEB-INF/i3-label_pt_BR.label | 2 +- web/gui/relatorios/filtroRelatorioCteos.zul | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCteos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCteos.java index 64df01bab..3f7b19f44 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCteos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCteos.java @@ -15,7 +15,7 @@ public class RelatorioCteos extends Relatorio { public RelatorioCteos(Map parametros, Connection conexao) throws Exception { - super(parametros, conexao); + super(parametros, conexao); this.setCustomDataSource(new ArrayDataSource(this) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCteos_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCteos_es.properties index d37e40726..cf92ee392 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCteos_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCteos_es.properties @@ -1,7 +1,7 @@ #geral msg.noData=Não foi possivel obter dados com os parâmetros informados. -#Labels cabeçalho +#Labels cabeçalho cabecalho.relatorio=Relatório: cabecalho.periodo=Período: cabecalho.periodoA=à diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCteos_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCteos_pt_BR.properties index adfca100f..3a575ca2b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCteos_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCteos_pt_BR.properties @@ -1,7 +1,7 @@ #geral msg.noData=Não foi possivel obter dados com os parâmetros informados. -#Labels cabeçalho +#Labels cabeçalho cabecalho.relatorio=Relatório: cabecalho.periodo=Período: cabecalho.periodoA=à diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCteos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCteos.jasper index 2478d5bd972b54ffa3e4e67e4f6a06a4e00e4c5d..c86195b41b9220b610b1ef3b861bfe8d6b3f57a6 100644 GIT binary patch delta 6056 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCteos.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCteos.jrxml index a50702e75..e1d4cb67c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCteos.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCteos.jrxml @@ -1,7 +1,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCteosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCteosController.java index b9af824f2..503ea4ed5 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCteosController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCteosController.java @@ -37,7 +37,7 @@ public class RelatorioCteosController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; private Datebox dtInicio; - private Datebox dtFim; + private Datebox dtFim; private MyComboboxEstandar cmbEmpresa; private Combobox cmbPuntoVenta; private MyListbox estadoList; diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioCteos.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioCteos.java index f968553dd..1893be8ba 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioCteos.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioCteos.java @@ -7,7 +7,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; public class ItemMenuRelatorioCteos extends DefaultItemMenuSistema { - public ItemMenuRelatorioCteos() { + public ItemMenuRelatorioCteos() { super("indexController.mniRelatorioCteos.label"); } diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index 44aea02c4..05d54c8dc 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/web/WEB-INF/i3-label_en.label @@ -1,7 +1,7 @@ # Para alterar esta planilha, selecione Ferramentas | Planilhas # E abrir a planilha no editor. -# Formato da clav +# Formato da clav # Control ZUL. Identificación del Componente. Propiedad=XXX # . . =XXX indexController.app.nome=Sales Administration diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index ca0058f0a..a19c2badf 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -2,7 +2,7 @@ # Para alterar esta planilha, seleccione Ferramentas | Planilhas # E abrir a planilha no editor. -# Formato da clav +# Formato da clav # Control ZUL. Identificación del Componente. Propiedad = XXX # . . = XXX indexController.app.nome=Administracion de la Venta diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 07beb63cd..56682750a 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -1,7 +1,7 @@ # Para alterar esta planilha, selecione Ferramentas | Planilhas # E abrir a planilha no editor. -# Formato da clav +# Formato da clav # Control ZUL. Identificación del Componente. Propiedad = XXX # . . = XXX indexController.app.nome=Administração da Venta diff --git a/web/gui/relatorios/filtroRelatorioCteos.zul b/web/gui/relatorios/filtroRelatorioCteos.zul index ee8f60b16..5a0755b4f 100644 --- a/web/gui/relatorios/filtroRelatorioCteos.zul +++ b/web/gui/relatorios/filtroRelatorioCteos.zul @@ -5,7 +5,7 @@ -