From f527f49c6dcb66c5714ba25169afcf814c1f9010 Mon Sep 17 00:00:00 2001 From: walace Date: Fri, 28 May 2021 20:16:59 +0000 Subject: [PATCH] fixes bug#22450 qua:juliane dev: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@106947 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasConexaoRuta.java | 17 +-- .../RelatorioVendasConexaoRuta.jasper | Bin 53235 -> 53113 bytes .../RelatorioVendasConexaoRuta.jrxml | 143 +++++++++--------- web/WEB-INF/i3-label_es_MX.label | 15 +- web/WEB-INF/i3-label_pt_BR.label | 4 +- .../filtroRelatorioVendasConexaoRuta.zul | 4 +- 6 files changed, 91 insertions(+), 92 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java index b9aee4593..bd74585b5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java @@ -40,10 +40,7 @@ public class RelatorioVendasConexaoRuta extends Relatorio { public void initDados() throws Exception { Map parametros = this.relatorio.getParametros(); fecInicio = new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime()); - fecFinal = new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_FINAL")).getTime()); - -// fecInicio = (Timestamp) parametros.get("DATA_INICIAL"); -// fecFinal = (Timestamp) parametros.get("DATA_INICIAL"); + fecFinal = new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime()); Connection conexao = this.relatorio.getConexao(); processarVendasConexao(conexao, parametros); @@ -185,10 +182,6 @@ public class RelatorioVendasConexaoRuta extends Relatorio { sb.append(" CONV.descconvenio as descuento "); sb.append("FROM caja c "); sb.append("JOIN boleto b on (c.transacao_id = b.boleto_id) "); - sb.append("JOIN caja_formapago cfp ON cfp.caja_id = c.caja_id "); - sb.append("LEFT JOIN caja_det_pago cdp ON cdp.cajaformapago_id = cfp.cajaformapago_id "); - sb.append("LEFT JOIN caja_tarjeta ct ON ct.cajadetpago_id = cdp.cajadetpago_id "); - sb.append("JOIN forma_pago fp ON fp.formapago_id = cfp.formapago_id "); sb.append("JOIN marca m ON c.marca_id = m.marca_id "); sb.append("JOIN empresa e ON e.empresa_id = m.empresa_id "); sb.append("JOIN punto_venta pv ON pv.puntoventa_id = c.puntoventa_id "); @@ -199,10 +192,10 @@ public class RelatorioVendasConexaoRuta extends Relatorio { sb.append("INNER JOIN vigencia_tarifa vt ON c.fechorventa BETWEEN vt.feciniciovigencia AND vt.fecfinvigencia "); sb.append("AND vt.activo = 1 "); sb.append("INNER JOIN usuario u ON (c.usuario_id = u.usuario_id) "); - sb.append("join conexion cc on cc.conexionctrl_id = c.conexionctrl_id and cc.activo =1 "); - sb.append("join conexion_ruta_tramo_ctrl ctr on ctr.conexionrutatramoctrl_id = cc.conexionrutatramoctrl_id and ctr.activo = 1 "); - sb.append("join conexion_ruta_ctrl ctrl on ctrl.conexionrutactrl_id = ctr.conexionrutactrl_id and ctrl.activo =1 "); - sb.append("join conexion_ruta_conf conf on conf.conexionrutaconf_id = ctrl.conexionrutaconf_id and conf.activo =1 "); + sb.append("left join conexion cc on cc.conexionctrl_id = c.conexionctrl_id and cc.activo =1 "); + sb.append("left join conexion_ruta_tramo_ctrl ctr on ctr.conexionrutatramoctrl_id = cc.conexionrutatramoctrl_id and ctr.activo = 1 "); + sb.append("left join conexion_ruta_ctrl ctrl on ctrl.conexionrutactrl_id = ctr.conexionrutactrl_id and ctrl.activo =1 "); + sb.append("left join conexion_ruta_conf conf on conf.conexionrutaconf_id = ctrl.conexionrutaconf_id and conf.activo =1 "); sb.append("left JOIN CONVENIO_DET CONV_D ON CONV_D.CONVENIODET_ID = c.CONVENIODET_ID "); sb.append(" left join CONVENIO CONV ON CONV.CONVENIO_ID = CONV_D.CONVENIO_ID "); sb.append("WHERE c.indconexion = 1"); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasConexaoRuta.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasConexaoRuta.jasper index 31fb61b2c4b1d8606faf3fccd50fa24fbbf94582..9b7a22fcda778207ee9e3cf03a5be4bccfb4d5f9 100644 GIT binary patch literal 53113 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 literal 53235 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 R>+0;yENp?S(dTCp{~uYkFmC_= diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasConexaoRuta.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasConexaoRuta.jrxml index 0b60b9981..b80b3a241 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasConexaoRuta.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasConexaoRuta.jrxml @@ -1,8 +1,10 @@ - - - + + + + + @@ -44,7 +46,7 @@ <band height="32"> <textField> - <reportElement x="0" y="5" width="802" height="27"/> + <reportElement x="0" y="0" width="802" height="32"/> <textElement textAlignment="Center" verticalAlignment="Middle" lineSpacing="Single"> <font size="18" isBold="true"/> </textElement> @@ -55,395 +57,389 @@ <pageHeader> <band height="78"> <textField> - <reportElement x="212" y="27" width="91" height="22"/> + <reportElement x="212" y="27" width="91" height="31"/> <textElement lineSpacing="Single"> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.dataFinal}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="27" width="70" height="22"/> + <reportElement x="0" y="27" width="70" height="31"/> <textElement lineSpacing="Single"> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.dataInicial}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement x="303" y="27" width="163" height="22" isPrintWhenDetailOverflows="true"/> + <reportElement x="303" y="27" width="163" height="31" isPrintWhenDetailOverflows="true"/> <textElement lineSpacing="Single"> <font size="10" isBold="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{DATA_FINAL}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement x="70" y="27" width="72" height="22" isPrintWhenDetailOverflows="true"/> + <reportElement x="70" y="27" width="72" height="31" isPrintWhenDetailOverflows="true"/> <textElement lineSpacing="Single"> <font size="10" isBold="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="303" y="4" width="269" height="15" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="212" y="0" width="360" height="27" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{cabecalho.pagina} + " " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField> - <reportElement x="572" y="4" width="98" height="15"/> + <reportElement x="572" y="0" width="98" height="27"/> <textElement textAlignment="Right" verticalAlignment="Middle" lineSpacing="Single"> <font size="10" isBold="true"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="670" y="4" width="132" height="15" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="670" y="0" width="132" height="27" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="378" y="60" width="36" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="378" y="58" width="36" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="5" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.dataEmbarque}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="0" y="60" width="25" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="0" y="58" width="25" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.bilhete}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="466" y="60" width="19" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="466" y="58" width="19" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.preco}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="485" y="60" width="29" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="485" y="58" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.taxaEmbarque}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="240" y="60" width="63" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="240" y="58" width="63" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.descricaoLinha}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="70" y="60" width="72" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="70" y="58" width="72" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.origem}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="142" y="60" width="70" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="142" y="58" width="70" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.destino}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="444" y="60" width="22" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="444" y="58" width="22" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="5" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.poltrona}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="50" y="60" width="20" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="50" y="58" width="20" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.bpe}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="212" y="60" width="28" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="212" y="58" width="28" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.numLinha}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="303" y="60" width="32" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="303" y="58" width="32" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.servico}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="335" y="60" width="43" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="335" y="58" width="43" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.classeServico}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="414" y="60" width="30" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="414" y="58" width="30" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.dataVenda}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="514" y="60" width="29" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="514" y="58" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.pedagio}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="543" y="60" width="29" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="543" y="58" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.seguro}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="601" y="60" width="26" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="601" y="58" width="26" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="5" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.numeroAgencia}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="627" y="60" width="43" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="627" y="58" width="43" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.nomeAgencia}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="670" y="60" width="26" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="670" y="58" width="26" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.cveusuario}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="25" y="60" width="25" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="25" y="58" width="25" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="5" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.subSerie}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="696" y="60" width="38" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="696" y="58" width="38" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.IDCesta}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="734" y="60" width="32" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="734" y="58" width="32" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.IDCadastroConexao}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="766" y="60" width="36" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="766" y="58" width="36" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.descricaoConexao}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="572" y="60" width="29" height="14" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="572" y="58" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.descricaoDesconto}]]></textFieldExpression> </textField> - <line> - <reportElement x="0" y="58" width="802" height="1"/> - </line> </band> </pageHeader> - <columnHeader> - <band height="8"/> - </columnHeader> <detail> - <band height="18"> + <band height="20"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement x="240" y="0" width="63" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="240" y="0" width="63" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{descricaoLinha}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> - <reportElement x="378" y="0" width="36" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="378" y="0" width="36" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{dataEmbarque}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement x="0" y="0" width="25" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="0" y="0" width="25" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{bilhete}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement x="466" y="0" width="19" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="466" y="0" width="19" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{preco}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement x="485" y="0" width="29" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="485" y="0" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{taxaEmbarque}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement x="444" y="0" width="22" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="444" y="0" width="22" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{poltrona}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="###0" isBlankWhenNull="true"> - <reportElement x="50" y="0" width="20" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="50" y="0" width="20" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{numBpe}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="###0" isBlankWhenNull="true"> - <reportElement x="70" y="0" width="17" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="70" y="0" width="17" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{codOrigem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement x="87" y="0" width="55" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="87" y="0" width="55" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{descricaoOrigem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="###0" isBlankWhenNull="true"> - <reportElement x="142" y="0" width="19" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="142" y="0" width="19" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{codDestino}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement x="161" y="0" width="51" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="161" y="0" width="51" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{descricaoDestino}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="###0" isBlankWhenNull="true"> - <reportElement x="212" y="0" width="28" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="212" y="0" width="28" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{numLinha}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement x="303" y="0" width="32" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="303" y="0" width="32" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{servico}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement x="335" y="0" width="43" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="335" y="0" width="43" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{classeServico}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> - <reportElement x="414" y="0" width="30" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="414" y="0" width="30" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="5"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{dataVenda}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement x="514" y="0" width="29" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="514" y="0" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{pedagio}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement x="543" y="0" width="29" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="543" y="0" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{seguro}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="###0" isBlankWhenNull="true"> - <reportElement x="601" y="0" width="26" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="601" y="0" width="26" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{numeroAgencia}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement x="627" y="0" width="43" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="627" y="0" width="43" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{nomeAgencia}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement x="670" y="0" width="26" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="670" y="0" width="26" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{cveusuario}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement x="25" y="0" width="25" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="25" y="0" width="25" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{subSerie}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement x="696" y="0" width="38" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="696" y="0" width="38" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="5"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{numoperacion}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="###0" isBlankWhenNull="true"> - <reportElement x="734" y="0" width="32" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="734" y="0" width="32" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.Integer"><![CDATA[$F{idCadastroConexao}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement x="766" y="0" width="36" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="766" y="0" width="36" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{descricaoConexao}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement x="572" y="0" width="29" height="13" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> + <reportElement x="572" y="0" width="29" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> @@ -455,33 +451,30 @@ <band splitType="Stretch"/> </columnFooter> <pageFooter> - <band height="6" splitType="Stretch"> + <band height="9" splitType="Stretch"> <line> - <reportElement x="0" y="0" width="802" height="1"/> + <reportElement x="0" y="0" width="802" height="1" isRemoveLineWhenBlank="true"/> </line> </band> </pageFooter> <summary> - <band height="44" splitType="Stretch"> + <band height="17" splitType="Stretch"> <textField> - <reportElement x="0" y="11" width="50" height="14"/> + <reportElement x="0" y="1" width="50" height="16"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$R{label.total}]]></textFieldExpression> </textField> <textField> - <reportElement x="50" y="11" width="55" height="14"/> + <reportElement x="50" y="1" width="55" height="16"/> <textElement textAlignment="Center" lineSpacing="Single"> <font size="6"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$P{TOTAL}]]></textFieldExpression> </textField> <line> - <reportElement x="0" y="8" width="802" height="1"/> - </line> - <line> - <reportElement x="0" y="40" width="802" height="1"/> + <reportElement x="0" y="0" width="802" height="1" isRemoveLineWhenBlank="true"/> </line> </band> </summary> diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index a3d1120dd..fd6a5752d 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -9099,4 +9099,17 @@ relatorioGratuidadeAGEPANController.btnLimpar.value = Limpar relatorioGratuidadeAGEPANController.lbNumRuta.value = Num. Linha relatorioGratuidadeAGEPANController.lbPrefixo.value = Prefixo relatorioGratuidadeAGEPANController.lvVenda = Venda -relatorioGratuidadeAGEPANController.lbOrgao.value = Orgão Concedente \ No newline at end of file +relatorioGratuidadeAGEPANController.lbOrgao.value = Orgão Concedente + +#Relatorio de Vendas conexao por Linha + +relatorioVendaConexaoRuta.window.title = Reporte Vendas Conexão Por Linha +relatorioVendaConexaoRuta.lbDePeriodoDataInicial.value = Fechor Venta Inicial +relatorioVendaConexaoRuta.lbDePeriodoDataFinal = Fechor Venta Final +relatorioVendaConexaoRuta.lbEmpresa.value = Empresa +relatorioVendaConexaoRuta.btnPesquisa.label = Buscar +relatorioVendaConexaoRuta.btnLimpar.label = Limpar +relatorioVendaConexaoRuta.lbIdEmpresa.value = Id +relatorioVendaConexaoRuta.puntoVentaSelectedList.codigo = Código +relatorioVendaConexaoRuta.puntoVentaSelectedList.nome = Nombre +relatorioVendaConexaoRuta.lbAgencia.value = Punto Venta diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index e270949b9..5a617341a 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -877,8 +877,8 @@ relatorioDiferencasTransferenciasController.lbAgencia.value = Agência #Relatorio de Vendas conexao por Linha relatorioVendaConexaoRuta.window.title = Relatório Vendas Conexão Por Linha -relatorioVendaConexaoRuta.lbDePeriodoTransferencia.value = Data inicial -relatorioVendaConexaoRuta.lbAtePeriodoTransferencia.value = Data final +relatorioVendaConexaoRuta.lbDePeriodoDataInicial.value = Data Venda Inicial +relatorioVendaConexaoRuta.lbDePeriodoDataFinal = Data Venda Final relatorioVendaConexaoRuta.lbEmpresa.value = Empresa relatorioVendaConexaoRuta.btnPesquisa.label = Buscar relatorioVendaConexaoRuta.btnLimpar.label = Limpar diff --git a/web/gui/relatorios/filtroRelatorioVendasConexaoRuta.zul b/web/gui/relatorios/filtroRelatorioVendasConexaoRuta.zul index 8670b6e62..981c05c4d 100644 --- a/web/gui/relatorios/filtroRelatorioVendasConexaoRuta.zul +++ b/web/gui/relatorios/filtroRelatorioVendasConexaoRuta.zul @@ -15,13 +15,13 @@ </columns> <rows> <row> - <label value="${c:l('lb.dataIni.value')}" /> + <label value="${c:l('relatorioVendaConexaoRuta.lbDePeriodoDataInicial.value')}" /> <datebox id="dataInicial" width="50%" mold="rounded" format="dd/MM/yyyy" constraint="no empty" maxlength="10" /> </row> <row> - <label value="${c:l('lb.dataFin.value')}" /> + <label value="${c:l('relatorioVendaConexaoRuta.lbDePeriodoDataFinal')}" /> <datebox id="dataFinal" width="50%" mold="rounded" format="dd/MM/yyyy" constraint="no empty" maxlength="10" /> </row>