fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug #7629 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57515 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2016-07-04 12:57:22 +00:00
parent 76b1969263
commit 21338fa5ac
12 changed files with 581 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java
View File

@ -55,7 +55,7 @@ public class RelatorioAnaliticoVoucher extends Relatorio {
fim = DateUtil.fimFecha(fim); fim = DateUtil.fimFecha(fim);
NamedParameterStatement stmt = new NamedParameterStatement(getConexao(), getSql()); NamedParameterStatement stmt = new NamedParameterStatement(getConexao(), getSql());
stmt.setTimestamp("dataInicial", new java.sql.Timestamp(inicio.getTime())); stmt.setTimestamp("dataInicial", new java.sql.Timestamp(inicio.getTime()));
stmt.setTimestamp("dataFinal", new java.sql.Timestamp(fim.getTime())); stmt.setTimestamp("dataFinal", new java.sql.Timestamp(fim.getTime()));
stmt.setInt("empresaId", empresaId); stmt.setInt("empresaId", empresaId);
@ -73,10 +73,10 @@ public class RelatorioAnaliticoVoucher extends Relatorio {
item.setEmbarque(rset.getBigDecimal("TAXA_EMBARQUE")); item.setEmbarque(rset.getBigDecimal("TAXA_EMBARQUE"));
item.setSeguro(rset.getBigDecimal("SEGURO")); item.setSeguro(rset.getBigDecimal("SEGURO"));
item.setQtde(rset.getInt("QTDE")); item.setQtde(rset.getInt("QTDE"));
list.add(item); list.add(item);
} }
if (!getConexao().isClosed()) if (!getConexao().isClosed())
getConexao().close(); getConexao().close();
@ -85,84 +85,83 @@ public class RelatorioAnaliticoVoucher extends Relatorio {
private String getSql() { private String getSql() {
StringBuilder sQuery = new StringBuilder(); StringBuilder sQuery = new StringBuilder();
/* VENDIDO E IMPRESSO NA MESMA COMPETENCIA */ /* VENDIDO E IMPRESSO NA MESMA COMPETENCIA */
sQuery.append("SELECT 'VENDIDO E ENTREGUE MESMA COMPETÊNCIA' AS SITUACAO, ") sQuery.append("SELECT 'VENDIDO E ENTREGUE MESMA COMPETÊNCIA' AS SITUACAO, ")
.append("TO_CHAR(BE.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_ENTREGA, ") .append("TO_CHAR(BE.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_ENTREGA, ")
.append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ") .append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ")
.append("SUM(B.PRECIOPAGADO) AS TARIFA, ") .append("SUM(B.PRECIOPAGADO) AS TARIFA, ")
.append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ") .append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ")
.append("SUM(B.IMPORTESEGURO) AS SEGURO, ") .append("SUM(B.IMPORTESEGURO) AS SEGURO, ")
.append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, ") .append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, ")
.append("COUNT(B.BOLETO_ID) AS QTDE ") .append("COUNT(B.BOLETO_ID) AS QTDE ")
.append("FROM BOLETO B ") .append("FROM BOLETO B ")
.append("JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ") .append("JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ")
.append(" AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") .append(" AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ")
.append("JOIN FISCAL_R4 R4 ON BE.BOLETO_ID = R4.BOLETO_ID ") .append("JOIN FISCAL_R4 R4 ON BE.BOLETO_ID = R4.BOLETO_ID ")
.append("WHERE B.TIPOVENTA_ID IN (5,12,18) ") .append("WHERE B.TIPOVENTA_ID IN (5,12,18) ")
.append("AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") .append("AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ")
.append("AND B.EMPRESACORRIDA_ID = :empresaId ") .append("AND B.EMPRESACORRIDA_ID = :empresaId ")
.append("AND B.INDSTATUSBOLETO = 'V' ") .append("AND B.INDSTATUSBOLETO = 'V' ")
.append("AND B.MOTIVOCANCELACION_ID = 16 ") .append("AND B.MOTIVOCANCELACION_ID = 16 ")
.append("AND BE.INDSTATUSBOLETO = 'E' ") .append("AND BE.INDSTATUSBOLETO = 'E' ")
.append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') = TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY') ") .append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') = TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY') ")
.append("GROUP BY 'VENDIDO E ENTREGUE MESMA COMPETÊNCIA', ") .append("GROUP BY 'VENDIDO E ENTREGUE MESMA COMPETÊNCIA', ")
.append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ") .append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ")
.append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') "); .append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') ");
sQuery.append("UNION "); sQuery.append("UNION ");
/*VENDIDO EM COMPETÊNCIA ANTERIOR*/ /* VENDIDO EM COMPETÊNCIA ANTERIOR */
sQuery.append("SELECT 'VENDIDO EM COMPETÊNCIA ANTERIOR' AS SITUACAO, ") sQuery.append("SELECT 'VENDIDO EM COMPETÊNCIA ANTERIOR' AS SITUACAO, ")
.append("TO_CHAR(BE.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_ENTREGA, ") .append("TO_CHAR(BE.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_ENTREGA, ")
.append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ") .append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ")
.append("SUM(B.PRECIOPAGADO) AS TARIFA, ") .append("SUM(B.PRECIOPAGADO) AS TARIFA, ")
.append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ") .append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ")
.append("SUM(B.IMPORTESEGURO) AS SEGURO, ") .append("SUM(B.IMPORTESEGURO) AS SEGURO, ")
.append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, ") .append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, ")
.append("COUNT(B.BOLETO_ID) AS QTDE ") .append("COUNT(B.BOLETO_ID) AS QTDE ")
.append("FROM BOLETO B ") .append("FROM BOLETO B ")
.append("JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ") .append("JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ")
.append("JOIN FISCAL_R4 R4 ON BE.BOLETO_ID = R4.BOLETO_ID ") .append("JOIN FISCAL_R4 R4 ON BE.BOLETO_ID = R4.BOLETO_ID ")
.append("WHERE B.TIPOVENTA_ID IN (5,12,18) ") .append("WHERE B.TIPOVENTA_ID IN (5,12,18) ")
.append("AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") .append("AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ")
.append("AND BE.EMPRESACORRIDA_ID = :empresaId ") .append("AND BE.EMPRESACORRIDA_ID = :empresaId ")
.append("AND B.INDSTATUSBOLETO = 'V' ") .append("AND B.INDSTATUSBOLETO = 'V' ")
.append("AND B.MOTIVOCANCELACION_ID = 16 ") .append("AND B.MOTIVOCANCELACION_ID = 16 ")
.append("AND BE.INDSTATUSBOLETO = 'E' ") .append("AND BE.INDSTATUSBOLETO = 'E' ")
.append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') < TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY') ") .append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') < TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY') ")
.append("GROUP BY 'VENDIDO EM COMPETÊNCIA ANTERIOR', ") .append("GROUP BY 'VENDIDO EM COMPETÊNCIA ANTERIOR', ")
.append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ") .append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ")
.append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') "); .append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') ");
sQuery.append("UNION "); sQuery.append("UNION ");
/*VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA*/ /* VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA */
sQuery.append("SELECT 'VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA' AS SITUACAO, ") sQuery.append("SELECT 'VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA' AS SITUACAO, ")
.append("'' AS COMPETENCIA_ENTREGA, ") .append("'' AS COMPETENCIA_ENTREGA, ")
.append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ") .append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ")
.append("SUM(B.PRECIOPAGADO) AS TARIFA, ") .append("SUM(B.PRECIOPAGADO) AS TARIFA, ")
.append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ") .append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ")
.append("SUM(B.IMPORTESEGURO) AS SEGURO, ") .append("SUM(B.IMPORTESEGURO) AS SEGURO, ")
.append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, ") .append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, ")
.append("COUNT(B.BOLETO_ID) AS QTDE ") .append("COUNT(B.BOLETO_ID) AS QTDE ")
.append("FROM BOLETO B ") .append("FROM BOLETO B ")
.append("LEFT JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ") .append("LEFT JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ")
.append("WHERE B.TIPOVENTA_ID IN (5,12,18) ") .append("WHERE B.TIPOVENTA_ID IN (5,12,18) ")
.append("AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") .append("AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ")
.append("AND B.EMPRESACORRIDA_ID = :empresaId ") .append("AND B.EMPRESACORRIDA_ID = :empresaId ")
.append("AND B.INDSTATUSBOLETO = 'V' ") .append("AND B.INDSTATUSBOLETO = 'V' ")
.append("AND (B.MOTIVOCANCELACION_ID IS NULL OR ") .append("AND (B.MOTIVOCANCELACION_ID IS NULL OR ")
.append(" (B.MOTIVOCANCELACION_ID = 16 ") .append(" (B.MOTIVOCANCELACION_ID = 16 ")
.append(" AND BE.INDSTATUSBOLETO = 'E' ") .append(" AND BE.INDSTATUSBOLETO = 'E' ")
.append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') <> TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY')) ") .append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') <> TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY')) ")
.append(" ) ") .append(" ) ")
.append("GROUP BY 'VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA', ") .append("GROUP BY 'VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA', ")
.append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY') "); .append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY') ");
sQuery.append("ORDER BY SITUACAO, COMPETENCIA_ENTREGA, COMPETENCIA_VENDA"); sQuery.append("ORDER BY SITUACAO, COMPETENCIA_ENTREGA, COMPETENCIA_VENDA");
return sQuery.toString(); return sQuery.toString();
} }

118
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucherCancelados.java 100644
View File

@ -0,0 +1,118 @@
package com.rjconsultores.ventaboletos.relatorios.impl;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.vo.impressaofiscal.ItemRelatorioVoucher;
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
public class RelatorioAnaliticoVoucherCancelados extends Relatorio {
private static Logger log = Logger.getLogger(RelatorioAnaliticoVoucherCancelados.class);
List<ItemRelatorioVoucher> listdata = null;
public RelatorioAnaliticoVoucherCancelados(final Map<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);
this.setCustomDataSource(new DataSource(this) {
@Override
public void initDados() throws Exception {
try {
Date inicio = (Date) parametros.get("inicio");
Date fim = (Date) parametros.get("fim");
Empresa empresa = (Empresa) parametros.get("empresa");
listdata = buscarMovimentosAnaliticos(inicio, fim, empresa.getEmpresaId());
} catch (SQLException e) {
log.error("", e);
}
}
});
this.setCollectionDataSource(new JRBeanCollectionDataSource(listdata));
}
public List<ItemRelatorioVoucher> buscarMovimentosAnaliticos(Date inicio, Date fim, Integer empresaId) throws SQLException {
inicio = DateUtil.inicioFecha(inicio);
fim = DateUtil.fimFecha(fim);
NamedParameterStatement stmt = new NamedParameterStatement(getConexao(), getSql());
stmt.setTimestamp("dataInicial", new java.sql.Timestamp(inicio.getTime()));
stmt.setTimestamp("dataFinal", new java.sql.Timestamp(fim.getTime()));
stmt.setInt("empresaId", empresaId);
ResultSet rset = stmt.executeQuery();
List<ItemRelatorioVoucher> list = new ArrayList<ItemRelatorioVoucher>();
while (rset.next()) {
ItemRelatorioVoucher item = new ItemRelatorioVoucher();
item.setSituacao(rset.getString("SITUACAO"));
// item.setCompetenciaEntrega(rset.getString("COMPETENCIA_ENTREGA"));
item.setCompetenciaVenda(rset.getString("COMPETENCIA_VENDA"));
item.setCompetenciaCancelamento(rset.getString("COMPETENCIA_CANCELAMENTO"));
item.setTarifa(rset.getBigDecimal("TARIFA"));
item.setPedagio(rset.getBigDecimal("PEDAGIO"));
item.setEmbarque(rset.getBigDecimal("TAXA_EMBARQUE"));
item.setSeguro(rset.getBigDecimal("SEGURO"));
item.setQtde(rset.getInt("QTDE"));
list.add(item);
}
if (!getConexao().isClosed())
getConexao().close();
return list;
}
private String getSql() {
StringBuilder sQuery = new StringBuilder();
sQuery.append("SELECT 'CANCELADOS NA COMPETÊNCIA' AS SITUACAO, ");
sQuery.append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ");
sQuery.append("TO_CHAR(BE.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_CANCELAMENTO, ");
sQuery.append("SUM(B.PRECIOPAGADO) AS TARIFA, ");
sQuery.append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ");
sQuery.append("SUM(B.IMPORTESEGURO) AS SEGURO, ");
sQuery.append("SUM(B.IMPORTETAXAEMBARQUE) AS TAXA_EMBARQUE, ");
sQuery.append("COUNT(B.BOLETO_ID) AS QTDE ");
sQuery.append("FROM BOLETO B ");
sQuery.append("JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ");
sQuery.append("WHERE B.TIPOVENTA_ID IN (5,12,18) ");
sQuery.append("AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ");
sQuery.append("AND BE.EMPRESACORRIDA_ID = :empresaId ");
sQuery.append("AND B.MOTIVOCANCELACION_ID IN (31,32,10) ");
sQuery.append("AND BE.INDSTATUSBOLETO = 'C' ");
sQuery.append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') <= TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY') ");
sQuery.append("GROUP BY 'VENDIDO EM COMPETÊNCIA ANTERIOR', ");
sQuery.append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ");
sQuery.append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') ");
sQuery.append("ORDER BY SITUACAO, COMPETENCIA_CANCELAMENTO, COMPETENCIA_VENDA ");
return sQuery.toString();
}
@Override
protected void processaParametros() throws Exception {
}
}

2
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAnaliticoVoucherCancelados_es.properties 100644
View File

@ -0,0 +1,2 @@
#geral
msg.noData=Não foi possivel obter dados com os parâmetros informados.

2
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAnaliticoVoucherCancelados_pt_BR.properties 100644
View File

@ -0,0 +1,2 @@
#geral
msg.noData=Não foi possivel obter dados com os parâmetros informados.

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucherCancelados.jasper 100644
View File

Binary file not shown.

285
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucherCancelados.jrxml 100644
View File

@ -0,0 +1,285 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioAnaliticoVoucherCancelados" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="0e8aff42-5ba8-48ac-9950-da8178561888">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="15"/>
<property name="ireport.y" value="0"/>
<parameter name="nombempresa" class="java.lang.String"/>
<parameter name="competencia" class="java.lang.String"/>
<field name="tarifa" class="java.math.BigDecimal"/>
<field name="pedagio" class="java.math.BigDecimal"/>
<field name="embarque" class="java.math.BigDecimal"/>
<field name="seguro" class="java.math.BigDecimal"/>
<field name="situacao" class="java.lang.String"/>
<field name="competenciaCancelamento" class="java.lang.String"/>
<field name="competenciaVenda" class="java.lang.String"/>
<field name="qtde" class="java.lang.Integer"/>
<field name="total" class="java.math.BigDecimal"/>
<variable name="vTotalQtde" class="java.lang.Integer" calculation="Sum">
<variableExpression><![CDATA[$F{qtde}]]></variableExpression>
</variable>
<variable name="vTotalTarifa" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{tarifa}]]></variableExpression>
</variable>
<variable name="vTotalPedagio" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{pedagio}]]></variableExpression>
</variable>
<variable name="vTotalEmbarque" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{embarque}]]></variableExpression>
</variable>
<variable name="vTotalSeguro" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{seguro}]]></variableExpression>
</variable>
<variable name="vTotal" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{total}]]></variableExpression>
</variable>
<background>
<band splitType="Stretch"/>
</background>
<title>
<band height="65" splitType="Stretch">
<textField>
<reportElement x="84" y="40" width="471" height="23" uuid="63ce47a3-7e94-42a2-8325-eceef777fbe2"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$P{nombempresa}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="0" width="522" height="20" uuid="2e2e9caa-4076-4209-bdaf-0017ddf83a56"/>
<textElement verticalAlignment="Middle">
<font size="14" isBold="true"/>
</textElement>
<text><![CDATA[ANALITICO DE VOUCHERS CANCELADOS]]></text>
</staticText>
<textField pattern="dd/MM/yyyy HH:mm">
<reportElement x="522" y="0" width="279" height="20" uuid="6b4f1375-4f4b-4b80-83b8-7650e62e107e"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="20" width="80" height="20" uuid="3f1d0681-30be-4c3a-ae90-cf34dd4ede3c"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA["Competência: "]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="40" width="84" height="23" uuid="cf05ce5a-615b-41ac-b24d-2c45ca1bc60e"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<text><![CDATA[Empresa:]]></text>
</staticText>
<textField pattern="dd/MM/yyyy">
<reportElement x="80" y="20" width="205" height="20" uuid="7f5ee01d-f86d-49a4-a2a1-f1c671621ef0"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$P{competencia}]]></textFieldExpression>
</textField>
</band>
</title>
<pageHeader>
<band splitType="Stretch"/>
</pageHeader>
<columnHeader>
<band height="24" splitType="Stretch">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="2" width="147" height="20" uuid="e6dbc037-913e-4ccc-8c62-2b030b909d33"/>
<textElement verticalAlignment="Middle" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
</textElement>
<textFieldExpression><![CDATA["Situação"]]></textFieldExpression>
</textField>
<line>
<reportElement x="0" y="1" width="802" height="1" uuid="481b2107-ee62-4815-8a89-8435d34384c8"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="241" y="2" width="89" height="20" uuid="8e32858b-3bbe-453f-bc9c-e47cd03cbb72"/>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
</textElement>
<textFieldExpression><![CDATA["Competência Venda"]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="330" y="2" width="46" height="20" uuid="25ca2035-0d91-479e-acb6-d542514d7d5b"/>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
</textElement>
<textFieldExpression><![CDATA["Qtde"]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="716" y="2" width="85" height="20" uuid="2e674c44-07ff-4d6f-9643-2ba3bbbce4b9"/>
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
</textElement>
<textFieldExpression><![CDATA["Total"]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="376" y="2" width="85" height="20" uuid="3e9b6264-c5df-4ecd-b739-9030e097fc99"/>
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
</textElement>
<textFieldExpression><![CDATA["Tarifa"]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="461" y="2" width="85" height="20" uuid="d0e7d648-5347-4345-a95b-13a6895e77ed"/>
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
</textElement>
<textFieldExpression><![CDATA["Pedagio"]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="546" y="2" width="85" height="20" uuid="5f93a22b-64e8-4393-9d9c-fabb30e54b61"/>
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
</textElement>
<textFieldExpression><![CDATA["Embarque"]]></textFieldExpression>
</textField>
<line>
<reportElement positionType="Float" x="0" y="22" width="802" height="1" uuid="a33f21d9-c821-4fa9-8dd8-1768914351f2"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="147" y="2" width="94" height="20" uuid="86784842-c177-49aa-82ed-9b06e59d4aa4"/>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
</textElement>
<textFieldExpression><![CDATA["Competência Cancelamento"]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="631" y="2" width="85" height="20" uuid="8ba8c64a-e023-433b-9e42-2a96011c029e"/>
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
</textElement>
<textFieldExpression><![CDATA["Seguro"]]></textFieldExpression>
</textField>
</band>
</columnHeader>
<detail>
<band height="21" splitType="Stretch">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="147" height="20" uuid="880453bc-b85e-49c3-996a-6441cf25df5f"/>
<textElement verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{situacao}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="147" y="0" width="94" height="20" uuid="04367436-a76e-4e64-a157-4325ce7d98a5"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{competenciaCancelamento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="241" y="0" width="89" height="20" uuid="1e0ca195-eef6-46b7-ba9f-66af0ef33209"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{competenciaVenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="330" y="0" width="46" height="20" uuid="2564f9af-3487-4dda-bfaa-4467ea076db0"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{qtde}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="716" y="0" width="85" height="20" uuid="5a614727-0d7b-41da-a7b7-293558bf2bdc"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="376" y="0" width="85" height="20" uuid="c3aa8f19-46d6-4c0b-9703-e74adaa2b5d7"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="461" y="0" width="85" height="20" uuid="655984a8-3e4a-4ac7-8816-317469c6a3ee"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="546" y="0" width="85" height="20" uuid="fced1969-520a-4be8-b126-45c7dc8fae72"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{embarque}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="631" y="0" width="85" height="20" uuid="f13ecbfe-3b3f-48ad-8c7c-e93b8bfe3445"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{seguro}]]></textFieldExpression>
</textField>
</band>
</detail>
<columnFooter>
<band splitType="Stretch"/>
</columnFooter>
<pageFooter>
<band splitType="Stretch"/>
</pageFooter>
<summary>
<band height="24">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="330" y="3" width="46" height="20" uuid="6730eb69-2702-48c8-945b-e47c19c1fa1b"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalQtde}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="546" y="3" width="85" height="20" uuid="8705cf87-3709-41f9-9939-ebd197090831"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalEmbarque}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="461" y="3" width="85" height="20" uuid="9c25317a-a5b0-41e9-95d7-70c4b7ab124b"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalPedagio}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="376" y="3" width="85" height="20" uuid="27d46076-e886-4dc9-b324-d579c67ba8df"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalTarifa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="631" y="3" width="85" height="20" uuid="1b28acca-3838-4ca7-a11f-73b42793a888"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalSeguro}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="716" y="3" width="85" height="20" uuid="a4e22ca1-4e61-49f8-8a28-4ece1cb9f127"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotal}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="241" y="3" width="89" height="20" uuid="8e5281f5-8b41-407a-9cdf-5e79776bf269"/>
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
</textElement>
<textFieldExpression><![CDATA["Total"]]></textFieldExpression>
</textField>
<line>
<reportElement x="0" y="1" width="802" height="1" uuid="fb654034-ffac-46bd-85b3-13eb144ff5e2"/>
</line>
</band>
</summary>
</jasperReport>

52
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java
View File

@ -36,6 +36,7 @@ import org.zkoss.zul.Textbox;
import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAnaliticoFinanceiro; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAnaliticoFinanceiro;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAnaliticoVoucher; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAnaliticoVoucher;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAnaliticoVoucherCancelados;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioECFReducaoZ; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioECFReducaoZ;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.SaidaRelatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.SaidaRelatorio;
import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.EmpresaService;
@ -78,6 +79,7 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
private Button btnExeRelatorioVoucher; private Button btnExeRelatorioVoucher;
private Button btnExeRelatorioPendenciaEcf; private Button btnExeRelatorioPendenciaEcf;
private Button btnExeRelatorioPendenciaReducaoZ; private Button btnExeRelatorioPendenciaReducaoZ;
private Button btnExeRelatorioVoucherCancelados;
private Boolean isExibirTipoGeracaoArquivo; private Boolean isExibirTipoGeracaoArquivo;
private Boolean isExibirCompetencia; private Boolean isExibirCompetencia;
@ -165,6 +167,13 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
btnExeRelatorioPendenciaReducaoZ.setVisible(false); btnExeRelatorioPendenciaReducaoZ.setVisible(false);
} }
boolean isRelatorioVoucherCancelados = Executions.getCurrent().getArg().get("RELATORIO_VOUCHER_CANCELADOS") == null ? Boolean.FALSE : (Boolean) Executions.getCurrent().getArg().get("RELATORIO_VOUCHER_CANCELADOS");
if (isRelatorioVoucherCancelados) {
btnExeRelatorioVoucherCancelados.setVisible(true);
} else {
btnExeRelatorioVoucherCancelados.setVisible(false);
}
isExibirTipoGeracaoArquivo = (Boolean) Executions.getCurrent().getArg().get("ExibirTipoGeracaoArquivo"); isExibirTipoGeracaoArquivo = (Boolean) Executions.getCurrent().getArg().get("ExibirTipoGeracaoArquivo");
isExibirCompetencia = (Boolean) Executions.getCurrent().getArg().get("ExibirCompetencia"); isExibirCompetencia = (Boolean) Executions.getCurrent().getArg().get("ExibirCompetencia");
isExibirDatas = isExibirCompetencia != null ? !isExibirCompetencia : true; isExibirDatas = isExibirCompetencia != null ? !isExibirCompetencia : true;
@ -449,6 +458,49 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
} }
} }
@SuppressWarnings({ "unchecked", "rawtypes" })
public void onClick$btnExeRelatorioVoucherCancelados(Event ev) throws InterruptedException {
try {
Empresa empresa = null;
Comboitem itemEmpresa = cmbEmpresa.getSelectedItem();
if (itemEmpresa != null) {
empresa = (Empresa) itemEmpresa.getValue();
}
txtCompetencia.getValue();
if (!DateUtil.isCompetenciaValida(txtCompetencia.getValue())) {
Messagebox.show(Labels.getLabel("MSG.Error.invalida.competencia"),
Labels.getLabel("busquedaImportacionFiscalRelatorioVoucherController.window.title"),
Messagebox.OK, Messagebox.ERROR);
return;
}
Date dataInicial = DateUtil.getDataInicialCompetencia(txtCompetencia.getValue());
Date dataFinal = DateUtil.getDataFinalCompetencia(txtCompetencia.getValue());
Map<String, Object> parametros = new HashMap<String, Object>();
parametros.put("competencia", txtCompetencia.getValue());
parametros.put("inicio", dataInicial);
parametros.put("fim", dataFinal);
parametros.put("empresa", empresa);
parametros.put("nombempresa", empresa.getNombempresa());
RelatorioAnaliticoVoucherCancelados relatorio = new RelatorioAnaliticoVoucherCancelados(parametros, dataSourceRead.getConnection());
Map args = new HashMap();
args.put("relatorio", relatorio);
openWindow("/component/reportView.zul",
Labels.getLabel("busquedaImportacionFiscalRelatorioVoucherCanceladosController.window.title"), args, MODAL);
} catch (SQLException e) {
log.error(e.getMessage(), e);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
public void onClick$btnExeRelatorioVoucher(Event ev) throws InterruptedException { public void onClick$btnExeRelatorioVoucher(Event ev) throws InterruptedException {
try { try {

8
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/TipoImportacaoFiscal.java
View File

@ -5,7 +5,7 @@ import java.util.HashMap;
public class TipoImportacaoFiscal { public class TipoImportacaoFiscal {
public enum TipoImportacao { public enum TipoImportacao {
ECF_RED_Z, ECF, ECF_CANCELADOS, MANUAL, REDUCAO_Z, NAO_FISCAL, RELATORIO_FINANCEIRO, RELATORIO_VOUCHER, PENDENCIA_ECF, PENDENCIA_REDUCAO_Z; ECF_RED_Z, ECF, ECF_CANCELADOS, MANUAL, REDUCAO_Z, NAO_FISCAL, RELATORIO_FINANCEIRO, RELATORIO_VOUCHER, PENDENCIA_ECF, PENDENCIA_REDUCAO_Z, RELATORIO_VOUCHER_CANCELADOS;
} }
public static HashMap<String, Boolean> selecionaTipoImportacao(TipoImportacao tipo, HashMap<String, Boolean> map) { public static HashMap<String, Boolean> selecionaTipoImportacao(TipoImportacao tipo, HashMap<String, Boolean> map) {
@ -19,6 +19,8 @@ public class TipoImportacaoFiscal {
map.remove(TipoImportacao.RELATORIO_FINANCEIRO.toString()); map.remove(TipoImportacao.RELATORIO_FINANCEIRO.toString());
map.remove(TipoImportacao.RELATORIO_VOUCHER.toString()); map.remove(TipoImportacao.RELATORIO_VOUCHER.toString());
map.remove(TipoImportacao.PENDENCIA_ECF.toString()); map.remove(TipoImportacao.PENDENCIA_ECF.toString());
map.remove(TipoImportacao.PENDENCIA_REDUCAO_Z.toString());
map.remove(TipoImportacao.RELATORIO_VOUCHER_CANCELADOS.toString());
if (tipo.equals(TipoImportacao.ECF_RED_Z)) { if (tipo.equals(TipoImportacao.ECF_RED_Z)) {
map.put(TipoImportacao.ECF_RED_Z.toString(), Boolean.TRUE); map.put(TipoImportacao.ECF_RED_Z.toString(), Boolean.TRUE);
@ -60,6 +62,10 @@ public class TipoImportacaoFiscal {
map.put(TipoImportacao.PENDENCIA_REDUCAO_Z.toString(), Boolean.TRUE); map.put(TipoImportacao.PENDENCIA_REDUCAO_Z.toString(), Boolean.TRUE);
} }
if (tipo.equals(TipoImportacao.RELATORIO_VOUCHER_CANCELADOS)) {
map.put(TipoImportacao.RELATORIO_VOUCHER_CANCELADOS.toString(), Boolean.TRUE);
}
return map; return map;
} }

35
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/relatorios/ItemMenuFiscalRelatorioVoucherCancelados.java 100644
View File

@ -0,0 +1,35 @@
package com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.impressaofiscal.relatorios;
import java.util.HashMap;
import org.zkoss.util.resource.Labels;
import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria;
import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema;
import com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.impressaofiscal.TipoImportacaoFiscal;
import com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.impressaofiscal.TipoImportacaoFiscal.TipoImportacao;
public class ItemMenuFiscalRelatorioVoucherCancelados extends DefaultItemMenuSistema {
public ItemMenuFiscalRelatorioVoucherCancelados() {
super("indexController.mniRelatorioVoucherCancelados.label");
}
@Override
public String getClaveMenu() {
return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.IMPRESSAOFISCAL.MENU.IMPORTACIONFISCAL";
}
@Override
public void ejecutar() {
@SuppressWarnings("unchecked")
HashMap<String, Boolean> map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.RELATORIO_VOUCHER_CANCELADOS, (HashMap<String, Boolean>) getArgs());
map.put("ExibirCompetencia", true);
PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImportacionFiscal.zul",
Labels.getLabel("busquedaImportacionFiscalRelatorioVoucherCanceladosController.window.title"), map, desktop);
}
}

2
web/WEB-INF/i3-label_es_MX.label
View File

@ -286,6 +286,7 @@ indexController.mniRelatorioVoucher.label=Voucher
indexController.mniImportacionFiscalPendenciaEcf.label=Pendência ECF indexController.mniImportacionFiscalPendenciaEcf.label=Pendência ECF
indexController.mniImportacionFiscalPendenciaReducaoZ.label=Pendência Redução Z indexController.mniImportacionFiscalPendenciaReducaoZ.label=Pendência Redução Z
indexController.mniImportacionFiscalEcfReducaoZ.label=ECF Integrado Redução Z indexController.mniImportacionFiscalEcfReducaoZ.label=ECF Integrado Redução Z
indexController.mniRelatorioVoucherCancelados.label=Voucher Cancelados
indexController.mniSubMenuClientePacote.label=Paquete indexController.mniSubMenuClientePacote.label=Paquete
indexController.mniManutencaoPacote.label=Mantenimiento Paquete indexController.mniManutencaoPacote.label=Mantenimiento Paquete
@ -6470,6 +6471,7 @@ busquedaImportacionFiscalRelatorioVoucherController.window.title=Impressão Fisc
busquedaImportacionFiscalEcfPendenciaController.window.title=Impressão Fiscal :: Pendência ECF busquedaImportacionFiscalEcfPendenciaController.window.title=Impressão Fiscal :: Pendência ECF
busquedaImportacionFiscalEcfPendenciaReducaoZController.window.title=Impressão Fiscal :: Pendência Redução Z busquedaImportacionFiscalEcfPendenciaReducaoZController.window.title=Impressão Fiscal :: Pendência Redução Z
busquedaImportacionFiscalEcfReducaoZController.window.title=Impressão Fiscal :: ECF Integrado c/ Redução Z busquedaImportacionFiscalEcfReducaoZController.window.title=Impressão Fiscal :: ECF Integrado c/ Redução Z
busquedaImportacionFiscalRelatorioVoucherCanceladosController.window.title=Impressão Fiscal :: Relatório Voucher Cancelados
#OCD #OCD
busquedaOCDParamController.empresa.label=Empresa busquedaOCDParamController.empresa.label=Empresa

2
web/WEB-INF/i3-label_pt_BR.label
View File

@ -292,6 +292,7 @@ indexController.mniRelatorioVoucher.label=Voucher
indexController.mniImportacionFiscalPendenciaEcf.label=Pendência ECF indexController.mniImportacionFiscalPendenciaEcf.label=Pendência ECF
indexController.mniImportacionFiscalPendenciaReducaoZ.label=Pendência Redução Z indexController.mniImportacionFiscalPendenciaReducaoZ.label=Pendência Redução Z
indexController.mniImportacionFiscalEcfReducaoZ.label=ECF Integrado Redução Z indexController.mniImportacionFiscalEcfReducaoZ.label=ECF Integrado Redução Z
indexController.mniRelatorioVoucherCancelados.label=Voucher Cancelados
indexController.mniSubMenuClientePacote.label=Pacote indexController.mniSubMenuClientePacote.label=Pacote
indexController.mniManutencaoPacote.label=Manutenção Pacote indexController.mniManutencaoPacote.label=Manutenção Pacote
@ -6633,6 +6634,7 @@ busquedaImportacionFiscalRelatorioVoucherController.window.title=Impressão Fisc
busquedaImportacionFiscalEcfPendenciaController.window.title=Impressão Fiscal :: Pendência ECF busquedaImportacionFiscalEcfPendenciaController.window.title=Impressão Fiscal :: Pendência ECF
busquedaImportacionFiscalEcfPendenciaReducaoZController.window.title=Impressão Fiscal :: Pendência Redução Z busquedaImportacionFiscalEcfPendenciaReducaoZController.window.title=Impressão Fiscal :: Pendência Redução Z
busquedaImportacionFiscalEcfReducaoZController.window.title=Impressão Fiscal :: ECF Integrado c/ Redução Z busquedaImportacionFiscalEcfReducaoZController.window.title=Impressão Fiscal :: ECF Integrado c/ Redução Z
busquedaImportacionFiscalRelatorioVoucherCanceladosController.window.title=Impressão Fiscal :: Relatório Voucher Cancelados
# Relatorio Conferencia Formulario Fisico # Relatorio Conferencia Formulario Fisico
relatorioConferenciaFormularioFisicoController.lbDataIni.value = Data Inicial relatorioConferenciaFormularioFisicoController.lbDataIni.value = Data Inicial

3
web/gui/impressaofiscal/busquedaImportacionFiscal.zul
View File

@ -100,6 +100,9 @@
<button id="btnExeRelatorioPendenciaReducaoZ" image="/gui/img/enginer.png" <button id="btnExeRelatorioPendenciaReducaoZ" image="/gui/img/enginer.png"
label="${c:l('busquedaImportacionFiscalController.btnExe.label')}" /> label="${c:l('busquedaImportacionFiscalController.btnExe.label')}" />
<button id="btnExeRelatorioVoucherCancelados" image="/gui/img/enginer.png"
label="${c:l('busquedaImportacionFiscalController.btnExe.label')}" />
</toolbar> </toolbar>