From a994c4aa41d3f51e85f8c0f3dd2bb4fe4b71b166 Mon Sep 17 00:00:00 2001 From: "alexandre.lima" Date: Wed, 26 Jul 2017 19:59:40 +0000 Subject: [PATCH] Fixes Bug #0009359 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@71926 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioFinanceiroGrupoLinhas.java | 97 ++++++++++ ...orioFinanceiroGrupoLinhas_pt_BR.properties | 1 + .../RelatorioFinanceiroGrupoLinhas.jasper | Bin 0 -> 27432 bytes .../RelatorioFinanceiroGrupoLinhas.jrxml | 181 ++++++++++++++++++ .../RelatorioFormaPagamentoAgencia.jasper | Bin 32046 -> 32098 bytes .../RelatorioFormaPagamentoAgencia.jrxml | 66 +++---- .../FinanceiroGrupoLinhasController.java | 161 ++++++++++++++++ ...temMenuRelatorioFinanceiroGrupoLinhas.java | 25 +++ .../utilerias/menu/menu_original.properties | 3 +- web/WEB-INF/i3-label_pt_BR.label | 9 + 10 files changed, 509 insertions(+), 34 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroGrupoLinhas.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroGrupoLinhas_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroGrupoLinhas.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroGrupoLinhas.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FinanceiroGrupoLinhasController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioFinanceiroGrupoLinhas.java diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroGrupoLinhas.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroGrupoLinhas.java new file mode 100644 index 000000000..3e0c92351 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroGrupoLinhas.java @@ -0,0 +1,97 @@ +/** + * + */ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +/** + * @author Thiago + * + */ +public class RelatorioFinanceiroGrupoLinhas extends RelatorioDemandas { + public RelatorioFinanceiroGrupoLinhas(Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + this.setCustomDataSource(new ArrayDataSource(this) { + @Override + public void initDados() throws Exception { + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); + Connection conexao = this.relatorio.getConexao(); + Map parametros = this.relatorio.getParametros(); + + Date dataIncial = (Date) parametros.get("DATA_INICIAL"); + + Date dataFinal = (Date) parametros.get("DATA_FINAL"); + + Integer empresa = (Integer) parametros.get("EMPRESA"); + + Integer agencia = (Integer) parametros.get("AGENCIA"); + + Boolean somenteCancelados = (Boolean) parametros.get("SOMENTE_CANCELADOS"); + + StringBuilder where = new StringBuilder(); + where.append(" WHERE 1 = 1 "); + + if (dataIncial != null) { + where.append(" AND caja.fechorventa >= to_date('" + format.format(dataIncial) + "','dd/MM/yyyy') "); + } + + if (dataFinal != null) { + where.append(" AND caja.fechorventa <= to_date('" + format.format(dataFinal) + "','dd/MM/yyyy') "); + } + + if (empresa != null) { + where.append(" AND caja.EMPRESAPUNTOVENTA_ID = " + empresa + " "); + } + + if (agencia != null) { + where.append(" AND pv.PUNTOVENTA_ID = " + agencia + " "); + } + + if (somenteCancelados) { + where.append(" AND caja.MOTIVOCANCELACION_ID is not null "); + } + + StringBuilder sql = new StringBuilder(); + sql.append(" select to_date(caja.FECHORVENTA, 'dd/MM/yyyy') as FECHORVENTA,MC.DESCMOTIVO,pv.NOMBPUNTOVENTA,EMPRESA.NOMBEMPRESA,gr.DESCGRUPO,sum(caja.PRECIOPAGADO) as PRECIOPAGADO "); + sql.append(" from caja join ruta on caja.RUTA_ID = ruta.RUTA_ID "); + sql.append(" join grupo_ruta gr on ruta.GRUPORUTA_ID = gr.GRUPORUTA_ID "); + sql.append(" join PUNTO_VENTA pv on pv.PUNTOVENTA_ID = caja.PUNTOVENTA_ID "); + sql.append(" join MARCA on caja.MARCA_ID = MARCA.MARCA_ID "); + sql.append(" join EMPRESA on EMPRESA.EMPRESA_ID = MARCA.EMPRESA_ID "); + sql.append(" LEFT JOIN MOTIVO_CANCELACION MC ON MC.MOTIVOCANCELACION_ID = caja.MOTIVOCANCELACION_ID "); + sql.append(where); + sql.append(" group by to_date(caja.FECHORVENTA, 'dd/MM/yyyy'),MC.DESCMOTIVO,pv.NOMBPUNTOVENTA,EMPRESA.NOMBEMPRESA,gr.DESCGRUPO "); + sql.append(" order by pv.NOMBPUNTOVENTA, to_date(caja.FECHORVENTA,'dd/MM/yyyy') "); + + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString()); + + ResultSet rset = stmt.executeQuery(); + + while (rset.next()) { + Map dataResult = new HashMap(); + + dataResult.put("FECHORVENTA", format.format(rset.getDate("FECHORVENTA"))); + dataResult.put("DESCMOTIVO", rset.getString("DESCMOTIVO")); + dataResult.put("NOMBPUNTOVENTA", rset.getString("NOMBPUNTOVENTA")); + dataResult.put("NOMBEMPRESA", rset.getString("NOMBEMPRESA")); + dataResult.put("DESCGRUPO", rset.getString("DESCGRUPO")); + dataResult.put("NOMBEMPRESA", rset.getString("NOMBEMPRESA")); + dataResult.put("PRECIOPAGADO", rset.getDouble("PRECIOPAGADO")); + + this.dados.add(dataResult); + } + + this.resultSet = rset; + } + }); + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroGrupoLinhas_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroGrupoLinhas_pt_BR.properties new file mode 100644 index 000000000..4c7dfdb6a --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroGrupoLinhas_pt_BR.properties @@ -0,0 +1 @@ +msg.noData=N�o foi possivel obter dados com os par�metros informados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroGrupoLinhas.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroGrupoLinhas.jasper new file mode 100644 index 0000000000000000000000000000000000000000..7f7097aab22a06158f31ea57f26b3e4d6cddbc29 GIT binary patch literal 27432 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 U%2_V7$T>FI1YgdmI^4+re`H48PXGV_ literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroGrupoLinhas.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroGrupoLinhas.jrxml new file mode 100644 index 000000000..c3813f08d --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroGrupoLinhas.jrxml @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="62" splitType="Stretch"> + <staticText> + <reportElement uuid="7f9cea32-d0e7-4c05-9efc-233cdd5137ab" x="0" y="39" width="66" height="20"/> + <textElement> + <font isBold="true"/> + </textElement> + <text><![CDATA[PERÍODO:]]></text> + </staticText> + <staticText> + <reportElement uuid="367cee8b-2874-4078-b9c4-90285e81ec06" x="0" y="0" width="802" height="20"/> + <textElement textAlignment="Center"> + <font size="14" isBold="true"/> + </textElement> + <text><![CDATA[Relatório Financeiro por Grupo de Linhas]]></text> + </staticText> + <staticText> + <reportElement uuid="c45a1ecd-8b5e-4bd7-9139-56e0844cea7e" x="127" y="39" width="10" height="20"/> + <textElement> + <font isBold="true"/> + </textElement> + <text><![CDATA[ - ]]></text> + </staticText> + <textField pattern="dd/MM/yyyy"> + <reportElement uuid="07dfa225-148c-4de6-a428-3c91f83c4081" x="67" y="39" width="60" height="20"/> + <textElement/> + <textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy"> + <reportElement uuid="3948e59f-21d8-47c8-8077-a57af30605c5" x="137" y="39" width="60" height="20"/> + <textElement/> + <textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jasper index 3b8d9ded506b27140781fc5efafa85380e5cd9af..a7e233ea3d60908601e5ce74cf94a66a19eb0010 100644 GIT binary patch delta 4576 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 X=!)!du~l1FJyO5%$;8_AYc~G}Y=aag diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jrxml index e10313bd5..08a6330f2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jrxml @@ -1,8 +1,8 @@ - - - + + + @@ -36,9 +36,9 @@ - <band height="102" splitType="Stretch"> + <band height="68" splitType="Stretch"> <staticText> - <reportElement uuid="7f9cea32-d0e7-4c05-9efc-233cdd5137ab" x="1" y="39" width="51" height="20"/> + <reportElement uuid="7f9cea32-d0e7-4c05-9efc-233cdd5137ab" x="1" y="39" width="65" height="20"/> <textElement> <font isBold="true"/> </textElement> @@ -52,91 +52,91 @@ <text><![CDATA[Relatório de Forma de Pagamento por Agência]]></text> </staticText> <staticText> - <reportElement uuid="c45a1ecd-8b5e-4bd7-9139-56e0844cea7e" x="165" y="39" width="10" height="20"/> + <reportElement uuid="c45a1ecd-8b5e-4bd7-9139-56e0844cea7e" x="125" y="39" width="10" height="20"/> <textElement> <font isBold="true"/> </textElement> <text><![CDATA[ - ]]></text> </staticText> <textField pattern="dd/MM/yyyy"> - <reportElement uuid="07dfa225-148c-4de6-a428-3c91f83c4081" x="80" y="39" width="85" height="20"/> + <reportElement uuid="07dfa225-148c-4de6-a428-3c91f83c4081" x="66" y="39" width="59" height="20"/> <textElement/> <textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement uuid="3948e59f-21d8-47c8-8077-a57af30605c5" x="175" y="39" width="100" height="20"/> + <reportElement uuid="3948e59f-21d8-47c8-8077-a57af30605c5" x="135" y="39" width="63" height="20"/> <textElement/> <textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression> </textField> </band> - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -149,7 +149,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -198,21 +198,21 @@ - - + + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FinanceiroGrupoLinhasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FinanceiroGrupoLinhasController.java new file mode 100644 index 000000000..0b4f947ed --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FinanceiroGrupoLinhasController.java @@ -0,0 +1,161 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.web.gui.controladores.financeiro; + +import java.util.Date; +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.Checkbox; +import org.zkoss.zul.Datebox; + +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioFinanceiroGrupoLinhas; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioFormaPagamentoAgencia; +import com.rjconsultores.ventaboletos.service.FormaPagamentoAgenciaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; + +/** + * + * @author Administrador + */ +@Controller("financeiroGrupoLinhasController") +@Scope("prototype") +public class FinanceiroGrupoLinhasController extends MyGenericForwardComposer { + + @Autowired + private FormaPagamentoAgenciaService financeiroService; + + @Autowired + private DataSource dataSourceRead; + + private Datebox fecInicio; + private Datebox fecFinal; + private Checkbox somenteCancelados; + + private MyComboboxEstandar cmbEmpresa; + private List lsEmpresas; + + private MyComboboxPuntoVenta cmbAgencia; + + @Override + public void doAfterCompose(Component comp) throws Exception { + + lsEmpresas = UsuarioLogado.getUsuarioLogado().getEmpresa(); + + super.doAfterCompose(comp); + } + + + public Checkbox getSomenteCancelados() { + return somenteCancelados; + } + + + public void setSomenteCancelados(Checkbox somenteCancelados) { + this.somenteCancelados = somenteCancelados; + } + + + public MyComboboxPuntoVenta getCmbAgencia() { + return cmbAgencia; + } + + + public void setCmbAgencia(MyComboboxPuntoVenta cmbAgencia) { + this.cmbAgencia = cmbAgencia; + } + + + public FormaPagamentoAgenciaService getFinanceiroService() { + return financeiroService; + } + + public void setFinanceiroService(FormaPagamentoAgenciaService financeiroService) { + this.financeiroService = financeiroService; + } + + public DataSource getDataSourceRead() { + return dataSourceRead; + } + + public void setDataSourceRead(DataSource dataSourceRead) { + this.dataSourceRead = dataSourceRead; + } + + public MyComboboxEstandar getCmbEmpresa() { + return cmbEmpresa; + } + + public void setCmbEmpresa(MyComboboxEstandar cmbEmpresa) { + this.cmbEmpresa = cmbEmpresa; + } + + public List getLsEmpresas() { + return lsEmpresas; + } + + public void setLsEmpresas(List lsEmpresas) { + this.lsEmpresas = lsEmpresas; + } + + public Datebox getFecFinal() { + return fecFinal; + } + + public void setFecFinal(Datebox fecFinal) { + this.fecFinal = fecFinal; + } + + public Datebox getFecInicio() { + return fecInicio; + } + + public void setFecInicio(Datebox fecInicio) { + this.fecInicio = fecInicio; + } + + public void onClick$btnInforme(Event e) throws Exception { + Date dataInicio = fecInicio.getValue(); + Date dataFinal = fecFinal.getValue(); + + Map argsInforme = new HashMap(); + argsInforme.put("DATA_INICIAL", dataInicio); + argsInforme.put("DATA_FINAL", dataFinal); + argsInforme.put("SOMENTE_CANCELADOS", somenteCancelados.isChecked()); + + if (cmbEmpresa.isValid() && cmbEmpresa.getSelectedItem() != null) { + Integer empresaId = ((Empresa)cmbEmpresa.getSelectedItem().getValue()).getEmpresaId(); + argsInforme.put("EMPRESA", empresaId); + } + + if (cmbAgencia.getSelectedItem() != null) { + Integer agencia = ((PuntoVenta) cmbAgencia.getSelectedItem().getValue()).getPuntoventaId(); + argsInforme.put("AGENCIA", agencia); + } + + RelatorioFinanceiroGrupoLinhas relatorio = new RelatorioFinanceiroGrupoLinhas(argsInforme, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("financeiroGrupoLinhasController.window.title"), args, MODAL); + + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioFinanceiroGrupoLinhas.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioFinanceiroGrupoLinhas.java new file mode 100644 index 000000000..5204567ac --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioFinanceiroGrupoLinhas.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 ItemMenuRelatorioFinanceiroGrupoLinhas extends DefaultItemMenuSistema { + + public ItemMenuRelatorioFinanceiroGrupoLinhas() { + super("financeiroGrupoLinhasController.mniRelatorioFinanceiro.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOFINANCEIROGRUPOLINHASCONTROLLER"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/informes/formaPagamentoAgencia/financeiroGrupoLinhas.zul", + Labels.getLabel("financeiroGrupoLinhasController.mniRelatorioFinanceiro.label"), getArgs(), desktop); + } + +} \ No newline at end of file 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 41c3229b9..05964d445 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 @@ -170,7 +170,8 @@ analitico.gerenciais.financeiro.relatorioFinanceiroReceitasDespesas=com.rjconsul analitico.gerenciais.financeiro.relatorioDepositos=com.rjconsultores.ventaboletos.web.utilerias.menu.item.contacorrente.ItemMenuRelatorioDepositos analitico.gerenciais.financeiro.relatorioDepositosDetalhados=com.rjconsultores.ventaboletos.web.utilerias.menu.item.contacorrente.ItemMenuRelatorioDepositosDetalhados analitico.gerenciais.financeiro.relatorioPosicaoCaixaAnalitico=com.rjconsultores.ventaboletos.web.utilerias.menu.item.contacorrente.ItemMenuRelatorioPosicaoCaixaAnalitico -analitico.gerenciais.financeiro.relatorioPosicaoCaixaAnalitico=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioFormaPagamentoAgencia +analitico.gerenciais.financeiro.relatorioFormaPagamentoAgencia=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioFormaPagamentoAgencia +analitico.gerenciais.financeiro.relatorioFinanceiroGrupoLinhas=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioFinanceiroGrupoLinhas analitico.gerenciais.pacote=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.gerenciais.pacote.SubMenuRelatorioPacote analitico.gerenciais.pacote.boletos=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioVendasPacotesBoletos analitico.gerenciais.pacote.detalhado=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioVendasPacotesDetalhado diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index d4fa6667b..364b1e589 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -374,6 +374,15 @@ formaPagamentoAgenciaController.lbDataIni.value = Data Início formaPagamentoAgenciaController.lbDataFin.value = Data Fim formaPagamentoAgenciaController.lbEmpresa.value = Empresa +# Relatório Financeiro por Grupo de Linhas +financeiroGrupoLinhasController.mniRelatorioFinanceiro.label = Financeiro por Grupo de Linhas +financeiroGrupoLinhasController.window.title = Financeiro por Grupo de Linhas +financeiroGrupoLinhasController.lbAgencia.value = Agência +financeiroGrupoLinhasController.lbDataIni.value = Data Início +financeiroGrupoLinhasController.lbDataFin.value = Data Fim +financeiroGrupoLinhasController.lbEmpresa.value = Empresa +financeiroGrupoLinhasController.label.somenteCancelados = Somente Cancelados + # Muestra a Pesquisa Tipo Classe busquedaClaseServicioController.window.title = Tipo de Classe busquedaClaseServicioController.btnRefresh.tooltiptext = Atualizar