From 6b9b4225174fb0bcdc988c268cba8faac3d7e896 Mon Sep 17 00:00:00 2001 From: "bruno.neves" Date: Wed, 2 Aug 2017 13:35:53 +0000 Subject: [PATCH] =?UTF-8?q?fix=20bug=20#0009384=20-=20Desenvolvimento=20do?= =?UTF-8?q?=20Relat=C3=B3rio=20de=20AIDF=20Detalhado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@72182 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioAidfDetalhado.java | 91 ++++++++ .../RelatorioAidfDetalhado_es_BR.properties | 24 ++ .../RelatorioAidfDetalhado_pt_BR.properties | 20 ++ .../RelatorioAidf_pt_BR.properties | 3 + .../templates/RelatorioAidfDetalhado.jasper | Bin 0 -> 30872 bytes .../templates/RelatorioAidfDetalhado.jrxml | 213 ++++++++++++++++++ .../RelatorioAidfDetalhadoController.java | 207 +++++++++++++++++ .../ItemMenuRelatorioAidfDetalhado.java | 25 ++ .../utilerias/menu/menu_original.properties | 1 + web/WEB-INF/i3-label_es_MX.label | 11 + web/WEB-INF/i3-label_pt_BR.label | 11 + .../filtroRelatorioAidfDetalhado.zul | 50 ++++ 12 files changed, 656 insertions(+) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAidfDetalhado.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_es_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidfDetalhado.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidfDetalhado.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioAidfDetalhado.java create mode 100644 web/gui/relatorios/filtroRelatorioAidfDetalhado.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAidfDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAidfDetalhado.java new file mode 100644 index 000000000..e56c85299 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAidfDetalhado.java @@ -0,0 +1,91 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.util.HashMap; +import java.util.Map; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +public class RelatorioAidfDetalhado extends Relatorio { + + public RelatorioAidfDetalhado(Map parametros, Connection conexao) throws Exception + { + super(parametros, conexao); + + this.setCustomDataSource(new ArrayDataSource(this) { + + public void initDados() throws Exception { + Connection conexao = this.relatorio.getConexao(); + Map parametros = this.relatorio.getParametros(); + String sql = getSql(); + + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); + + ResultSet rset = stmt.executeQuery(); + + while (rset.next()) { + Map dataResult = new HashMap(); + dataResult.put("aidf", rset.getString("aidf")); + dataResult.put("empresa", rset.getString("nombempresa")); + dataResult.put("estacao", rset.getString("estacao")); + dataResult.put("agencia", rset.getString("nombpuntoventa")); + dataResult.put("serie", rset.getString("serie")); + dataResult.put("subserie", rset.getString("subserie")); + dataResult.put("numeracao", rset.getString("numeracao")); + dataResult.put("folios", rset.getString("folios")); + dataResult.put("forminicio", rset.getString("forminicial")); + dataResult.put("formfinal", rset.getString("formfinal")); + this.dados.add(dataResult); + } + + this.resultSet = rset; + } + }); + } + + @Override + protected void processaParametros() throws Exception { + } + + private String getSql() { + StringBuilder sql = new StringBuilder(); + sql.append(" select a.aidf_id as aidf, e.nombempresa, p.nombpuntoventa, a.serie, ab.estacion_id as estacao, a.subserie, a.forminicial, a.formfinal,"); + sql.append(" concat(a.forminicial, concat('-',a.formfinal)) as numeracao,"); + sql.append(" concat(fp.foliopreimpreso,concat('-',dab.numfoliofinal)) as folios "); + sql.append(" from aidf a "); + sql.append(" inner join empresa e on e.empresa_id = a.empresa_id "); + sql.append(" inner join abasto_boleto ab on a.empresa_id = ab.empresa_id and ab.ACTIVO = 1 "); + sql.append(" inner join det_abasto_boleto dab on dab.abastoboleto_id = ab.abastoboleto_id and dab.ACTIVO = 1 "); + sql.append(" inner join punto_venta p on p.puntoventa_id = ab.puntoventa_id and p.ACTIVO = 1"); + sql.append(" inner join folio_preimpreso fp on (a.serie=fp.numeserie or concat(a.aidf_id, concat(a.serie,a.subserie))=fp.numeserie) and fp.ACTIVO = 1"); + sql.append("where (case when (length(dab.numseriepreimpresa) < 3) then '0' else substr(dab.numseriepreimpresa,0,3) end) = cast(a.aidf_id as varchar(10))"); + sql.append(" and a.ACTIVO = 1"); + if(parametros.get("EMPRESA_ID") != null){ + sql.append(" and a.empresa_id = ").append(parametros.get("EMPRESA_ID")); + } + if(parametros.get("SERIE") != null){ + sql.append(" and (a.serie ='").append(parametros.get("SERIE")).append("'"); + sql.append(" or concat(a.aidf_id, concat(a.SERIE,a.SUBSERIE))='").append(parametros.get("SERIE")).append("')"); + } + if(parametros.get("AIDF") != null){ + sql.append(" and a.aidf_id like'%").append(parametros.get("AIDF")).append("%'"); + } + if(parametros.get("INICIOFORM") != null){ + sql.append(" and a.forminicial >= ").append(parametros.get("INICIOFORM")); + } + if(parametros.get("FIMFORM") != null){ + sql.append(" and a.formfinal <= ").append(parametros.get("FIMFORM")); + } + sql.append(" group by a.aidf_id, e.nombempresa, p.nombpuntoventa, a.serie, ab.estacion_id , a.subserie,concat(a.forminicial, concat('-',a.formfinal)), a.forminicial, a.formfinal, "); + sql.append(" concat(fp.foliopreimpreso,concat('-',dab.numfoliofinal)) "); + sql.append(" order by a.aidf_id"); + + return sql.toString(); + + + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_es_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_es_BR.properties new file mode 100644 index 000000000..c36856c15 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_es_BR.properties @@ -0,0 +1,24 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +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: + +#Labels header +label.aidf=AIDF +label.empresa=Empresa +label.agencia=Agência +label.serie=Série +label.bilhete=Bilhetes +label.numeracao=Numeração +label.subserie=Subserie +label.formInicio=F. Inicio +label.formFim=F. Fim + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_pt_BR.properties new file mode 100644 index 000000000..2f6485486 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_pt_BR.properties @@ -0,0 +1,20 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +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: + +#Labels header +label.aidf=AIDF +label.empresa=Empresa +label.agencia=Agencia +label.serie=Serie +label.bilhete=Bilhetes +label.numeracao=Numeração diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidf_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidf_pt_BR.properties index 2f6485486..ea9bb92da 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidf_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidf_pt_BR.properties @@ -18,3 +18,6 @@ label.agencia=Agencia label.serie=Serie label.bilhete=Bilhetes label.numeracao=Numeração +label.subserie=Subserie +label.formInicio=F. Inicio +label.formFim=F. Fim \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidfDetalhado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidfDetalhado.jasper new file mode 100644 index 0000000000000000000000000000000000000000..592ee77d09f59e64a7b7df79c6a49975b1266d53 GIT binary patch literal 30872 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 literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidfDetalhado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidfDetalhado.jrxml new file mode 100644 index 000000000..ee822178b --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidfDetalhado.jrxml @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java new file mode 100644 index 000000000..fbb48c49d --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java @@ -0,0 +1,207 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.sql.DataSource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Comboitem; +import org.zkoss.zul.Datebox; +import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAidfDetalhado; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; + +@Controller("relatorioAidfDetalhadoController") +@Scope("prototype") +public class RelatorioAidfDetalhadoController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + + private Datebox datInicial; + private Datebox datFinal; + private MyComboboxEstandar cmbEmpresa; + private List lsEmpresa; + private Textbox txtSerie; + private Textbox txtAIDF; + private Textbox txtInicioForm; + private Textbox txtFimForm; + + + @Autowired + private EmpresaService empresaService; + @Autowired + private DataSource dataSourceRead; + + @Override + public void doAfterCompose(Component comp) throws Exception { + lsEmpresa = empresaService.obtenerTodos(); + super.doAfterCompose(comp); + } + + /** + * @throws Exception + * + */ + @SuppressWarnings({ "rawtypes", "unchecked" }) + private void executarRelatorio() throws Exception { + Relatorio relatorio; + + Map parametros = new HashMap(); + + StringBuilder filtro = new StringBuilder(); + + parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioAidfDetalhadoController.window.title")); + parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); + parametros.put("USUARIO_NOME", UsuarioLogado.getUsuarioLogado().getNombusuario()); + + filtro.append("Empresa: "); + Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); + if (itemEmpresa != null) { + Empresa empresa = (Empresa) itemEmpresa.getValue(); + parametros.put("EMPRESA_ID", empresa.getEmpresaId()); + filtro.append(empresa.getNombempresa() + ";"); + } else { + filtro.append(" Todas;"); + } + filtro.append("AIDF: "); + if(!txtAIDF.getValue().equals("")){ + parametros.put("AIDF", txtAIDF.getValue()); + filtro.append(txtAIDF.getValue() + ";"); + }else{ + filtro.append(" Todas;"); + } + filtro.append("Inicio Form: "); + if(!txtInicioForm.getValue().equals("")){ + parametros.put("INICIOFORM", txtInicioForm.getValue()); + filtro.append(txtInicioForm.getValue() + ";"); + }else{ + filtro.append(" Todas;"); + } + filtro.append("Final Form: "); + if(!txtFimForm.getValue().equals("")){ + parametros.put("FIMFORM", txtFimForm.getValue()); + filtro.append(txtFimForm.getValue() + ";"); + }else{ + filtro.append(" Todas;"); + } + filtro.append("Serie: "); + if(!txtSerie.getValue().equals("")){ + parametros.put("SERIE", txtSerie.getValue()); + filtro.append(txtSerie.getValue() + ";"); + }else{ + filtro.append(" Todas;"); + } + + parametros.put("FILTROS", filtro.toString()); + relatorio = new RelatorioAidfDetalhado(parametros, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("relatorioAidfDetalhadoController.window.title"), args, MODAL); + } + + public void onClick$btnExecutarRelatorio(Event ev) throws Exception{ + executarRelatorio(); + } + + private void executarPesquisa() { + + } + + public void onClick$btnPesquisa(Event ev) { + executarPesquisa(); + } + + public void onClick$btnLimpar(Event ev) { + + } + + public void onDoubleClick$puntoVentaSelList(Event ev) { + + } + + public void onDoubleClick$puntoVentaList(Event ev) { + + } + + public Datebox getDatInicial() { + return datInicial; + } + + public void setDatInicial(Datebox datInicial) { + this.datInicial = datInicial; + } + + public Datebox getDatFinal() { + return datFinal; + } + + public void setDatFinal(Datebox datFinal) { + this.datFinal = datFinal; + } + + public List getLsEmpresa() { + return lsEmpresa; + } + + public void setLsEmpresa(List lsEmpresa) { + this.lsEmpresa = lsEmpresa; + } + + public MyComboboxEstandar getCmbEmpresa() { + return cmbEmpresa; + } + + public void setCmbEmpresa(MyComboboxEstandar cmbEmpresa) { + this.cmbEmpresa = cmbEmpresa; + } + + public Textbox getTxtSerie() { + return txtSerie; + } + + public void setTxtSerie(Textbox txtSerie) { + this.txtSerie = txtSerie; + } + + public Textbox getTxtAIDF() { + return txtAIDF; + } + + public void setTxtAIDF(Textbox txtAIDF) { + this.txtAIDF = txtAIDF; + } + + public Textbox getTxtInicioForm() { + return txtInicioForm; + } + + public void setTxtInicioForm(Textbox txtInicioForm) { + this.txtInicioForm = txtInicioForm; + } + + public Textbox getTxtFimForm() { + return txtFimForm; + } + + public void setTxtFimForm(Textbox txtFimForm) { + this.txtFimForm = txtFimForm; + } + + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioAidfDetalhado.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioAidfDetalhado.java new file mode 100644 index 000000000..b41ba3ff7 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioAidfDetalhado.java @@ -0,0 +1,25 @@ +package com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios; + +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria; +import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; + +public class ItemMenuRelatorioAidfDetalhado extends DefaultItemMenuSistema { + + public ItemMenuRelatorioAidfDetalhado() { + super("indexController.mniRelatorioAIDFDetalhado.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOAIDFDETALHADO"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioAidfDetalhado.zul", + Labels.getLabel("relatorioAidfDetalhadoController.window.title"), getArgs(), desktop); + + } +} 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 05964d445..c54693f2a 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 @@ -125,6 +125,7 @@ ingresosExtras.ingreso=com.rjconsultores.ventaboletos.web.utilerias.menu.item.in analitico=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.MenuAnalitico analitico.item=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.ItemMenuAnalitico analitico.gerenciais=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.gerenciais.SubMenuGerenciais +analitico.gerenciais.aidfDetalhado=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioAidfDetalhado analitico.gerenciais.confFormulario=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioConferenciaFormularioFisico analitico.gerenciais.difTransf=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioDiferencasTransferencias analitico.gerenciais.empresaCorrida=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioEmpresaCorrida diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index dfb436a9d..12454f7c7 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -271,6 +271,7 @@ indexController.mniRelatorioCancelamentoVendaCartao.label = Cancelación de Vent indexController.mniRelatorioCancelamentoTransacao.label = Cancelamento J3 indexController.mniRelatorioTabelaPreco.label = Relátorio de Tabela de Preços indexController.mniRelatorioAIDF.label = Reporte AIDF +indexController.mniRelatorioAIDFDetalhado.label = AIDF Detalhado indexController.mniPrecoApanhe.label = Preço Apanhe indexController.mniRelatorioVendasPacotesResumido.label = Ventas de Paquetes - Resumido indexController.mniRelatorioVendasPacotesDetalhado.label = Ventas de Paquetes - Detallado @@ -607,6 +608,16 @@ relatorioAidfController.dataFinal.value = Fecha Final relatorioAidfController.lbEmpresa.value = Empresa relatorioAidfController.lbSerie.value = Série +#Relatorio Aidf Detalhado +relatorioAidfDetalhadoController.window.title = Relatório Aidf Detalhado +relatorioAidfDetalhadoController.datainicial.value = Data Inicial +relatorioAidfDetalhadoController.dataFinal.value = Data Final +relatorioAidfDetalhadoController.lbEmpresa.value = Empresa +relatorioAidfDetalhadoController.lbSerie.value = Série +relatorioAidfDetalhadoController.lbAidf.value = AIDF +relatorioAidfDetalhadoController.lbFormInicial.value = Form. Inicial +relatorioAidfDetalhadoController.lbFormFinal.value = Form. Final + #Relatorio Tripulacao relatorioTripulacao.label=Informe Tripulación relatorioTripulacaoController.lbDataInicial=Fecha Inicial diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 5cb9502bf..b1948843b 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -285,6 +285,7 @@ indexController.mniRelatorioEstornoCartao.label=Estorno Cartão indexController.mniRelatorioCancelamentoTransacao.label = Cancelamento J3 indexController.mniRelatorioTabelaPreco.label = Tabela de Preços indexController.mniRelatorioAIDF.label = AIDF +indexController.mniRelatorioAIDFDetalhado.label = AIDF Detalhado indexController.mniPrecoApanhe.label = Preço Apanhe indexController.mniRelatorioVendasPacotesResumido.label = Vendas de Pacotes - Resumido indexController.mniRelatorioVendasPacotesDetalhado.label = Vendas de Pacotes - Detalhado @@ -723,6 +724,16 @@ relatorioAidfController.dataFinal.value = Data Final relatorioAidfController.lbEmpresa.value = Empresa relatorioAidfController.lbSerie.value = Série +#Relatorio Aidf Detalhado +relatorioAidfDetalhadoController.window.title = Relatório Aidf Detalhado +relatorioAidfDetalhadoController.datainicial.value = Data Inicial +relatorioAidfDetalhadoController.dataFinal.value = Data Final +relatorioAidfDetalhadoController.lbEmpresa.value = Empresa +relatorioAidfDetalhadoController.lbSerie.value = Série +relatorioAidfDetalhadoController.lbAidf.value = AIDF +relatorioAidfDetalhadoController.lbFormInicial.value = Form. Inicial +relatorioAidfDetalhadoController.lbFormFinal.value = Form. Final + # Pantalla Editar Classe editarClaseServicioController.window.title = Tipo de Classe editarClaseServicioController.btnApagar.tooltiptext = Eliminar diff --git a/web/gui/relatorios/filtroRelatorioAidfDetalhado.zul b/web/gui/relatorios/filtroRelatorioAidfDetalhado.zul new file mode 100644 index 000000000..ad687cee7 --- /dev/null +++ b/web/gui/relatorios/filtroRelatorioAidfDetalhado.zul @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +