From 87cce0aa5c2ee292493ba5992e5bd0f33297b0d8 Mon Sep 17 00:00:00 2001 From: fabio Date: Wed, 20 Sep 2017 21:04:19 +0000 Subject: [PATCH] Fixes bug #9839 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@74058 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasPacotesDetalhado.java | 71 ++++++++++++++---- ...atorioVendasPacotesDetalhado_es.properties | 45 +++++------ ...rioVendasPacotesDetalhado_pt_BR.properties | 45 +++++------ .../RelatorioVendasPacotesDetalhado.jasper | Bin 30426 -> 32766 bytes .../RelatorioVendasPacotesDetalhado.jrxml | 45 ++++++++--- ...torioVendasPacotesDetalhadoController.java | 36 ++++++--- web/WEB-INF/i3-label_es_MX.label | 6 +- web/WEB-INF/i3-label_pt_BR.label | 6 +- .../filtroRelatorioVendasPacotesDetalhado.zul | 26 +++---- 9 files changed, 182 insertions(+), 98 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java index ebebe1c1d..f28bac379 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java @@ -4,8 +4,8 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; -import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -25,13 +25,13 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioVendasPacotesDetalhado extends Relatorio { private static Logger log = Logger.getLogger(RelatorioVendasPacotesDetalhado.class); - - private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); private List lsDadosRelatorio; - private Timestamp fecInicio; - private Timestamp fecFinal; + private Timestamp fecPacoteInicio; + private Timestamp fecPacoteFinal; + private Timestamp fecVendaInicio; + private Timestamp fecVendaFinal; private Integer empresaId; private Integer pacoteId; private Integer origenId; @@ -48,8 +48,23 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { @Override public void initDados() throws Exception { Map parametros = this.relatorio.getParametros(); - fecInicio = new java.sql.Timestamp(DateUtil.inicioFecha(sdf.parse(parametros.get("fecInicio").toString())).getTime()); - fecFinal = new java.sql.Timestamp(DateUtil.fimFecha(sdf.parse(parametros.get("fecFinal").toString())).getTime()); + + if(parametros.get("fecPacoteInicio") != null ) { + fecPacoteInicio = new Timestamp(DateUtil.inicioFecha( (Date)parametros.get("fecPacoteInicio") ).getTime()); + } + + if(parametros.get("fecPacoteFinal") != null ) { + fecPacoteFinal = new Timestamp(DateUtil.fimFecha( (Date)parametros.get("fecPacoteFinal") ).getTime()); + } + + if(parametros.get("fecVendaInicio") != null ) { + fecVendaInicio = new Timestamp(DateUtil.inicioFecha( (Date)parametros.get("fecVendaInicio") ).getTime()); + } + + if(parametros.get("fecVendaFinal") != null ) { + fecVendaFinal = new Timestamp(DateUtil.fimFecha( (Date)parametros.get("fecVendaFinal") ).getTime()); + } + empresaId = parametros.get("empresaId") != null && !parametros.get("empresaId").equals("null") ? Integer.valueOf(parametros.get("empresaId").toString()) : null; pacoteId = parametros.get("pacoteId") != null && !parametros.get("pacoteId").equals("null") ? Integer.valueOf(parametros.get("pacoteId").toString()) : null; origenId = parametros.get("origenId") != null && !parametros.get("origenId").equals("null") ? Integer.valueOf(parametros.get("origenId").toString()) : null; @@ -79,33 +94,50 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { stmt = new NamedParameterStatement(conexao, sql); - if(fecInicio != null) { - stmt.setTimestamp("fecInicio", fecInicio); + if(fecPacoteInicio != null) { + stmt.setTimestamp("fecPacoteInicio", fecPacoteInicio); } - if(fecFinal != null) { - stmt.setTimestamp("fecFinal", fecFinal); + + if(fecPacoteFinal != null) { + stmt.setTimestamp("fecPacoteFinal", fecPacoteFinal); } + + if(fecVendaInicio != null) { + stmt.setTimestamp("fecVendaInicio", fecVendaInicio); + } + + if(fecVendaFinal != null) { + stmt.setTimestamp("fecVendaFinal", fecVendaFinal); + } + if (empresaId != null && empresaId > 0){ stmt.setInt("empresaId", empresaId); } + if (pacoteId != null && pacoteId > 0){ stmt.setInt("pacoteId", pacoteId); } + if(origenId != null) { stmt.setInt("origenId", origenId); } + if(destinoId != null) { stmt.setInt("destinoId", destinoId); } + if(usuarioId != null) { stmt.setInt("usuarioId", usuarioId); } + if(tipoTarifaPacoteId != null && tipoTarifaPacoteId > 0) { stmt.setInt("tipoTarifaPacoteId", tipoTarifaPacoteId); } + if(situacaoVendaPacote != null) { stmt.setInt("situacaoVendaPacote", situacaoVendaPacote.getShortValue()); } + if(StringUtils.isNotBlank(voucherNotaCredito)) { stmt.setLong("voucherNotaCredito", Long.valueOf(voucherNotaCredito)); } @@ -194,7 +226,6 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { .append("LEFT JOIN TIPO_TARIFA_PACOTE TTP ON TTP.TIPOTARIFAPACOTE_ID = PT.TIPOTARIFAPACOTE_ID ") .append("LEFT JOIN NOTA_CREDITO_VENDA_PACOTE NC ON NC.VENDAPACOTECANCELAMENTO_ID = VP.VENDAPACOTE_ID ") .append("LEFT JOIN VENDA_PACOTE VPNC ON NC.VENDAPACOTEPAGAMENTO_ID = VPNC.VENDAPACOTE_ID ") - .append("LEFT JOIN VENDA_PACOTE VPNC ON NC.VENDAPACOTEPAGAMENTO_ID = VPNC.VENDAPACOTE_ID ") .append("WHERE P.ACTIVO = 1 "); if(empresaId != null && empresaId > 0) { @@ -205,12 +236,20 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { sQuery.append("AND P.PACOTE_ID = :pacoteId "); } - if(fecInicio != null) { - sQuery.append("AND VP.DATAPACOTE >= :fecInicio "); + if(fecPacoteInicio != null) { + sQuery.append("AND VP.DATAPACOTE >= :fecPacoteInicio "); } - if(fecFinal != null) { - sQuery.append("AND VP.DATAPACOTE <= :fecFinal "); + if(fecPacoteFinal != null) { + sQuery.append("AND VP.DATAPACOTE <= :fecPacoteFinal "); + } + + if(fecVendaInicio != null) { + sQuery.append("AND VP.DATAVENDA >= :fecVendaInicio "); + } + + if(fecVendaFinal != null) { + sQuery.append("AND VP.DATAVENDA <= :fecVendaFinal "); } if(origenId != null) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_es.properties index 79d706d8c..99b71070d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_es.properties @@ -1,24 +1,27 @@ +#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.destino = Destino: +cabecalho.filtros = Filtros: +cabecalho.impressorPor = Impressor por: #Labels cabeçalho -cabecalho.nome=Relatório Vendas de Pacotes - Detalhado -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.situacaoPacote=Situação: -cabecalho.voucherNotaCredito=Voucher Nota Crédito: -label.empresa=Empresa: -label.pacote=Pacote: -cabecalho.origem=Origem: -cabecalho.destino=Destino: -cabecalho.usuario=Usuário: -cabecalho.tipoTarifaPacote=Tipo Tarifa: -label.empresa=Empresa: -label.trecho=Trecho: -label.resumo=Resumo \ No newline at end of file +cabecalho.nome = Relat\u00F3rio Vendas de Pacotes - Detalhado +cabecalho.origem = Origem: +cabecalho.pagina = P\u00E1gina +cabecalho.periodoA = \u00E0 +cabecalho.periodoPacote = Per\u00EDodo Pacote: +cabecalho.periodoVenda = Per\u00EDodo Venda: +cabecalho.relatorio = Relat\u00F3rio: +cabecalho.situacaoPacote = Situa\u00E7\u00E3o: +cabecalho.tipoTarifaPacote = Tipo Tarifa: +cabecalho.usuario = Usu\u00E1rio: +cabecalho.voucherNotaCredito = Voucher Nota Cr\u00E9dito: + +label.empresa = Empresa: +label.pacote = Pacote: +label.resumo = Resumo +label.trecho = Trecho: + +msg.noData = N\u00E3o foi possivel obter dados com os par\u00E2metros informados. diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_pt_BR.properties index 79d706d8c..99b71070d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesDetalhado_pt_BR.properties @@ -1,24 +1,27 @@ +#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.destino = Destino: +cabecalho.filtros = Filtros: +cabecalho.impressorPor = Impressor por: #Labels cabeçalho -cabecalho.nome=Relatório Vendas de Pacotes - Detalhado -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.situacaoPacote=Situação: -cabecalho.voucherNotaCredito=Voucher Nota Crédito: -label.empresa=Empresa: -label.pacote=Pacote: -cabecalho.origem=Origem: -cabecalho.destino=Destino: -cabecalho.usuario=Usuário: -cabecalho.tipoTarifaPacote=Tipo Tarifa: -label.empresa=Empresa: -label.trecho=Trecho: -label.resumo=Resumo \ No newline at end of file +cabecalho.nome = Relat\u00F3rio Vendas de Pacotes - Detalhado +cabecalho.origem = Origem: +cabecalho.pagina = P\u00E1gina +cabecalho.periodoA = \u00E0 +cabecalho.periodoPacote = Per\u00EDodo Pacote: +cabecalho.periodoVenda = Per\u00EDodo Venda: +cabecalho.relatorio = Relat\u00F3rio: +cabecalho.situacaoPacote = Situa\u00E7\u00E3o: +cabecalho.tipoTarifaPacote = Tipo Tarifa: +cabecalho.usuario = Usu\u00E1rio: +cabecalho.voucherNotaCredito = Voucher Nota Cr\u00E9dito: + +label.empresa = Empresa: +label.pacote = Pacote: +label.resumo = Resumo +label.trecho = Trecho: + +msg.noData = N\u00E3o foi possivel obter dados com os par\u00E2metros informados. diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhado.jasper index 1f0d02654374b1048ce2c5c8eeec2cc291554360..fc35755a3b871f45277c48554495f31e7d6344c6 100644 GIT binary patch literal 32766 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 DP9%PW delta 8633 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 - - + + - + + + @@ -17,6 +19,8 @@ + + @@ -26,7 +30,7 @@ - <band height="181" splitType="Stretch"> + <band height="200" splitType="Stretch"> <textField> <reportElement x="0" y="0" width="637" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/> <textElement markup="none"> @@ -49,54 +53,71 @@ <textFieldExpression><![CDATA[$R{label.empresa} + " " + $P{empresa}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="40" width="637" height="20" uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b"/> + <reportElement x="0" y="40" width="637" height="20" isRemoveLineWhenBlank="true" uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b"> + <printWhenExpression><![CDATA[$P{fecPacoteInicio} != null && $P{fecPacoteFinal} != null]]></printWhenExpression> + </reportElement> <textElement> <font isBold="true"/> </textElement> - <textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicio} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinal}]]></textFieldExpression> + <textFieldExpression><![CDATA[$R{cabecalho.periodoPacote} + +" " + new SimpleDateFormat("dd/MM/yyyy").format($P{fecPacoteInicio}) ++ " " + $R{cabecalho.periodoA} ++ " " + new SimpleDateFormat("dd/MM/yyyy").format($P{fecPacoteFinal})]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="60" width="637" height="20" uuid="66f394e2-0568-447d-9f46-c358a05628c5"/> + <reportElement x="0" y="80" width="637" height="20" uuid="66f394e2-0568-447d-9f46-c358a05628c5"/> <textElement> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.pacote} + " " + $P{nompacote}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="100" width="801" height="20" uuid="979b7126-0e47-4885-8a07-d8f9aa75a204"/> + <reportElement x="0" y="120" width="801" height="20" uuid="979b7126-0e47-4885-8a07-d8f9aa75a204"/> <textElement> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.usuario} + " " + $P{usuario}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="120" width="801" height="20" uuid="fa1e3d80-b034-4acc-8e6e-e32ebbfb35d5"/> + <reportElement x="0" y="140" width="801" height="20" uuid="fa1e3d80-b034-4acc-8e6e-e32ebbfb35d5"/> <textElement> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.tipoTarifaPacote} + " " + $P{tipoTarifaPacote}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="80" width="801" height="20" uuid="eb151f53-cf44-4e98-a49b-9427f740f9fc"/> + <reportElement x="0" y="100" width="801" height="20" uuid="eb151f53-cf44-4e98-a49b-9427f740f9fc"/> <textElement> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.origem} + " " + $P{origem} + " " + $R{cabecalho.destino} + " " + $P{destino}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="140" width="801" height="20" uuid="0081e5f0-0219-4d52-a883-d932296d8764"/> + <reportElement x="0" y="160" width="801" height="20" uuid="0081e5f0-0219-4d52-a883-d932296d8764"/> <textElement> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.situacaoPacote} + " " + $P{situacaoPacote}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="160" width="801" height="20" uuid="cc9c448f-3596-46c2-99bf-7ed4dc2cf865"/> + <reportElement x="0" y="180" width="801" height="20" uuid="cc9c448f-3596-46c2-99bf-7ed4dc2cf865"/> <textElement> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.voucherNotaCredito} + " " + $P{voucherNotaCredito}]]></textFieldExpression> </textField> + <textField> + <reportElement x="0" y="60" width="637" height="20" isRemoveLineWhenBlank="true" uuid="b7e70dbc-b468-47a0-8c5f-f3d7a67f8156"> + <printWhenExpression><![CDATA[$P{fecVendaInicio} != null && $P{fecVendaFinal} != null]]></printWhenExpression> + </reportElement> + <textElement> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.periodoVenda} + +" " + new SimpleDateFormat("dd/MM/yyyy").format($P{fecVendaInicio}) ++ " " + $R{cabecalho.periodoA} ++ " " + new SimpleDateFormat("dd/MM/yyyy").format($P{fecVendaFinal})]]></textFieldExpression> + </textField> </band> diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesDetalhadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesDetalhadoController.java index ce92713d9..e4cb1b8e6 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesDetalhadoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesDetalhadoController.java @@ -1,6 +1,5 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -63,8 +62,10 @@ public class RelatorioVendasPacotesDetalhadoController extends MyGenericForwardC private List lsEmpresa; private List lsPacote; private List lsTipoTarifaPacote; - private Datebox dataInicial; - private Datebox dataFinal; + private Datebox dataPacoteInicial; + private Datebox dataPacoteFinal; + private Datebox dataVendaInicial; + private Datebox dataVendaFinal; private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbPacote; private MyComboboxEstandar cmbTipoTarifaPacote; @@ -75,7 +76,6 @@ public class RelatorioVendasPacotesDetalhadoController extends MyGenericForwardC private MyComboboxParada cmbParadaDestino; private MyComboboxParadaCve cmbParadaDestinoCve; private MyComboboxUsuario cmbUsuario; - private Radio rTodos; private Radio rPagos; private Radio rReservados; private Radio rCancelados; @@ -138,14 +138,28 @@ public class RelatorioVendasPacotesDetalhadoController extends MyGenericForwardC public void onClick$btnExecutarRelatorio(Event ev) throws Exception { txtVoucherNotaCredito.getValue(); - - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - Date dataDe = dataInicial.getValue(); - Date dataAte = dataFinal.getValue(); - Map parametros = new HashMap(); - parametros.put("fecInicio", sdf.format(dataDe)); - parametros.put("fecFinal", sdf.format(dataAte)); + + Date dataPacoteDe = dataPacoteInicial.getValue(); + Date dataPacoteAte = dataPacoteFinal.getValue(); + Date dataVendaDe = dataVendaInicial.getValue(); + Date dataVendaAte = dataVendaFinal.getValue(); + + if( dataPacoteDe != null ) { + parametros.put("fecPacoteInicio", dataPacoteDe); + } + + if( dataPacoteAte != null ) { + parametros.put("fecPacoteFinal", dataPacoteAte); + } + + if( dataVendaDe != null ) { + parametros.put("fecVendaInicio", dataVendaDe); + } + + if( dataVendaAte != null ) { + parametros.put("fecVendaFinal", dataVendaAte); + } Comboitem cbiEmpresa = cmbEmpresa.getSelectedItem(); String empresaId = null; diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index fc05e50dc..f437e28cb 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -6466,8 +6466,10 @@ relatorioVendasPacotesResumidoController.lblEmpresa.value = Empresa # Relatorio Vendas Pacotes Detalhado relatorioVendasPacotesDetalhadoController.window.title = Reporte Ventas de Paquetes - Detallado -relatorioVendasPacotesDetalhadoController.lbDataIni.value = Fecha Inicio -relatorioVendasPacotesDetalhadoController.lbDataFin.value = Fecha Final +relatorioVendasPacotesDetalhadoController.lbDataVendaIni.value = Fec Venda Inicial +relatorioVendasPacotesDetalhadoController.lbDataVendaFin.value = Fec Venda Final +relatorioVendasPacotesDetalhadoController.lbDataPacoteIni.value = Fec Paquete Inicial +relatorioVendasPacotesDetalhadoController.lbDataPacoteFin.value = Fec Paquete Final relatorioVendasPacotesDetalhadoController.lblEmpresa.value = Empresa relatorioVendasPacotesDetalhadoController.lblPacote.value = Paquete relatorioVendasPacotesDetalhadoController.lblTipoTarifaPacote.value = Tipo Tarifa diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index ab8ba1890..8b2a0f0cf 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -6932,8 +6932,10 @@ relatorioVendasPacotesResumidoController.lblEmpresa.value = Empresa # Relatorio Vendas Pacotes Detalhado relatorioVendasPacotesDetalhadoController.window.title = Relatório Vendas de Pacotes - Detalhado -relatorioVendasPacotesDetalhadoController.lbDataIni.value = Data Inicial -relatorioVendasPacotesDetalhadoController.lbDataFin.value = Data Final +relatorioVendasPacotesDetalhadoController.lbDataVendaIni.value = Dt Venda Inicial +relatorioVendasPacotesDetalhadoController.lbDataVendaFin.value = Dt Venda Final +relatorioVendasPacotesDetalhadoController.lbDataPacoteIni.value = Dt Pacote Inicial +relatorioVendasPacotesDetalhadoController.lbDataPacoteFin.value = Dt Pacote Final relatorioVendasPacotesDetalhadoController.lblEmpresa.value = Empresa relatorioVendasPacotesDetalhadoController.lblPacote.value = Pacote relatorioVendasPacotesDetalhadoController.lblTipoTarifaPacote.value = Tipo Tarifa diff --git a/web/gui/relatorios/filtroRelatorioVendasPacotesDetalhado.zul b/web/gui/relatorios/filtroRelatorioVendasPacotesDetalhado.zul index 88b9a1b7e..70a659655 100644 --- a/web/gui/relatorios/filtroRelatorioVendasPacotesDetalhado.zul +++ b/web/gui/relatorios/filtroRelatorioVendasPacotesDetalhado.zul @@ -74,24 +74,24 @@ use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada" mold="rounded" buttonVisible="true" width="65%" /> - + - + + + -