fixes bug #9387
fixes bug #9689 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@72847 d1611594-4594-4d17-8e1d-87c2c4800839master
wilian
parent
5b2f87138f
commit
ee75d5efa7
|
|
@ -100,7 +100,11 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
|
|||
db.setEstadoId(rset.getInt("ESTADO_ID"));
|
||||
db.setFechorVenta((String) rset.getObject("FECHOR_VENTA"));
|
||||
db.setFechorDevolucao((String) rset.getObject("FECHOR_DEVOLUCAO"));
|
||||
db.setIcms(rset.getBigDecimal("ICMS"));
|
||||
|
||||
db.setIcmsInterestadual(rset.getObject("ICMSINTERESTADUAL") != null ? rset.getBigDecimal("ICMSINTERESTADUAL") : BigDecimal.ZERO);
|
||||
db.setIcmsIntermunicipal(rset.getObject("ICMSINTERMUNICIPAL") != null ? rset.getBigDecimal("ICMSINTERMUNICIPAL") : BigDecimal.ZERO);
|
||||
db.setTributacaoimportacao(rset.getObject("TRIBUTACAOIMPORTACAO") != null ? rset.getBigDecimal("TRIBUTACAOIMPORTACAO") : null);
|
||||
|
||||
db.setPorcredbaseicms(rset.getBigDecimal("PORCREDBASEICMS"));
|
||||
db.setPrecioBase(rset.getBigDecimal("PRECIOBASE"));
|
||||
db.setPrecioPagado(rset.getBigDecimal("PRECIOPAGADO"));
|
||||
|
|
@ -162,8 +166,15 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
|
|||
db.setValorContabil(valorContabil);
|
||||
|
||||
BigDecimal valorIcms = BigDecimal.ZERO;
|
||||
valorIcms = db.getValorContabil().multiply(db.getIcms().divide(UtiliteriasFiscal.CEM));
|
||||
//valorIcms = valorIcms.multiply(db.getPorcredbaseicms().divide(UtiliteriasFiscal.CEM));
|
||||
if(isEstadual) {
|
||||
if(db.getTributacaoimportacao() == null) {
|
||||
valorIcms = db.getValorContabil().multiply(db.getIcmsInterestadual().divide(UtiliteriasFiscal.CEM));
|
||||
} else {
|
||||
valorIcms = db.getValorContabil().multiply(db.getTributacaoimportacao().divide(UtiliteriasFiscal.CEM));
|
||||
}
|
||||
} else {
|
||||
valorIcms = db.getValorContabil().multiply(db.getIcmsIntermunicipal().divide(UtiliteriasFiscal.CEM));
|
||||
}
|
||||
if(db.isIsenta()) {
|
||||
db.setValorIsenta(valorIcms);
|
||||
} else {
|
||||
|
|
@ -210,15 +221,17 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
|
|||
sql.append(" PTVO.NUMPUNTOVENTA AS NUMPUNTOVENTAORIGEM, ");
|
||||
sql.append(" EST.NOMBESTADO AS ESTADO, ");
|
||||
sql.append(" EST.CVEESTADO AS UF, ");
|
||||
sql.append(" NVL(EST.ESTADO_ID,0) AS ESTADO_ID, ");
|
||||
sql.append(" NVL(EI.ICMS,0) AS ICMS, ");
|
||||
sql.append(" COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) AS ESTADO_ID, ");
|
||||
sql.append(" COALESCE(EI.ICMS, EST.ICMS) AS ICMSINTERESTADUAL, ");
|
||||
sql.append(" NVL(EI.ICMSIM,0) AS ICMSINTERMUNICIPAL, ");
|
||||
sql.append(" EI.TRIBUTACAOIMPORTACAO AS TRIBUTACAOIMPORTACAO, ");
|
||||
sql.append(" NVL(EI.PORCREDBASEICMS,0) AS PORCREDBASEICMS, ");
|
||||
sql.append(" TO_CHAR(BORI.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_VENTA, ");
|
||||
sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_DEVOLUCAO, ");
|
||||
sql.append(" (CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 1 ELSE 0 END) IS_ESTADUAL, ");
|
||||
sql.append(" (CASE WHEN COALESCE(COS.ESTADO_ID,CO.ESTADO_ID) <> COALESCE(CDS.ESTADO_ID,CD.ESTADO_ID) THEN 1 ELSE 0 END) IS_ESTADUAL, ");
|
||||
sql.append(" NVL(EI.PORCREDMUNICIPAL,0) AS PORC_MUNICIPAL, ");
|
||||
sql.append(" NVL(EI.PORCREDESTADUAL,0) AS PORC_ESTADUAL, ");
|
||||
sql.append(" (CASE WHEN NVL(ORI.REGIONMETROPOLITANA_ID ,-1) = NVL(DES.REGIONMETROPOLITANA_ID,-2) THEN 1 ELSE 0 END) as ISENTA, ");
|
||||
sql.append(" (CASE WHEN NVL(COALESCE(POS.REGIONMETROPOLITANA_ID,ORI.REGIONMETROPOLITANA_ID) ,-1) = NVL(COALESCE(PDS.REGIONMETROPOLITANA_ID,DES.REGIONMETROPOLITANA_ID),-2) THEN 1 ELSE 0 END) as ISENTA, ");
|
||||
sql.append(" NVL(B.PRECIOPAGADO,0) AS PRECIOPAGADO, NVL(B.IMPORTEOUTROS,0) AS IMPORTEOUTROS, NVL(B.IMPORTEPEDAGIO,0) AS IMPORTEPEDAGIO, NVL(B.IMPORTESEGURO,0) AS IMPORTESEGURO, NVL(B.IMPORTETAXAEMBARQUE,0) AS IMPORTETAXAEMBARQUE, ");
|
||||
sql.append(" NVL(EI.INDTARIFAMUNICIPAL,0) AS INDTARIFAMUNICIPAL, NVL(EI.INDSEGUROMUNICIPAL,0) AS INDSEGUROMUNICIPAL, NVL(EI.INDTXEMBARQUEMUNICIPAL,0) AS INDTXEMBARQUEMUNICIPAL, NVL(EI.INDPEDAGIOMUNICIPAL,0) AS INDPEDAGIOMUNICIPAL, ");
|
||||
sql.append(" NVL(EI.INDTARIFAESTADUAL,0) AS INDTARIFAESTADUAL, NVL(EI.INDSEGUROESTADUAL,0) AS INDSEGUROESTADUAL, NVL(EI.INDTXEMBARQUEESTADUAL,0) AS INDTXEMBARQUEESTADUAL, NVL(EI.INDPEDAGIOESTDUAL,0) AS INDPEDAGIOESTDUAL, ");
|
||||
|
|
@ -234,9 +247,21 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
|
|||
sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID ");
|
||||
sql.append("LEFT JOIN FISCAL_R4 R4 ON R4.BOLETO_ID = B.BOLETOORIGINAL_ID ");
|
||||
sql.append("LEFT JOIN PUNTO_VENTA PTVO ON PTVO.PUNTOVENTA_ID = B.PTOVTAVENTA_ID ");
|
||||
sql.append("LEFT JOIN EMPRESA_IMPOSTO EI ON EST.ESTADO_ID = EI.ESTADO_ID ");
|
||||
sql.append(" AND EI.EMPRESA_ID = M.EMPRESA_ID ");
|
||||
sql.append(" AND EI.ACTIVO = 1 ");
|
||||
|
||||
sql.append("LEFT JOIN ALIAS_SERVICO S ON S.ORIGEN_ID = B.ORIGEN_ID ");
|
||||
sql.append(" AND S.DESTINO_ID = B.DESTINO_ID AND (S.CORRIDA_ID = B.CORRIDA_ID OR S.CORRIDA_ID IS NULL) ");
|
||||
sql.append(" AND S.RUTA_ID = B.RUTA_ID ");
|
||||
sql.append("LEFT JOIN PARADA POS ON POS.PARADA_ID = S.ALIASORIGEN_ID ");
|
||||
sql.append("LEFT JOIN CIUDAD COS ON COS.CIUDAD_ID = POS.CIUDAD_ID ");
|
||||
sql.append("LEFT JOIN ESTADO EOS ON EOS.ESTADO_ID = COS.ESTADO_ID ");
|
||||
sql.append("LEFT JOIN PARADA PDS ON PDS.PARADA_ID = S.ALIASDESTINO_ID ");
|
||||
sql.append("LEFT JOIN CIUDAD CDS ON CDS.CIUDAD_ID = PDS.CIUDAD_ID ");
|
||||
sql.append("LEFT JOIN ESTADO EDS ON EDS.ESTADO_ID = CDS.ESTADO_ID ");
|
||||
sql.append("JOIN INSCRICAO_ESTADUAL IE ON E.EMPRESA_ID = IE.EMPRESA_ID ");
|
||||
sql.append(" AND IE.ESTADO_ID = COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) AND IE.ACTIVO = 1 ");
|
||||
sql.append("JOIN EMPRESA_IMPOSTO EI ON EI.EMPRESA_ID = E.EMPRESA_ID ");
|
||||
sql.append(" AND EI.ESTADO_ID = COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) AND EI.ACTIVO = 1 ");
|
||||
|
||||
sql.append("LEFT JOIN AIDF AIDF ON AIDF.AIDF_ID = B.AIDF_ID ");
|
||||
sql.append("LEFT JOIN BOLETO BORI ON BORI.BOLETO_ID = B.BOLETOORIGINAL_ID ");
|
||||
sql.append("WHERE B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) ");
|
||||
|
|
@ -264,7 +289,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
|
|||
}
|
||||
|
||||
sql.append("AND B.CATEGORIA_ID NOT IN (SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = 'GRATUIDADE_CRIANCA') ");
|
||||
sql.append(estados == null ? "" : "AND EST.ESTADO_ID IN (" + estados + ") ");
|
||||
sql.append(estados == null ? "" : "AND COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) IN (" + estados + ") ");
|
||||
sql.append(puntoVentas == null ? "" : "AND PTV.PUNTOVENTA_ID IN (" + puntoVentas + ") ");
|
||||
sql.append(empresaId == null ? "" : "AND E.EMPRESA_ID IN (" + empresaId + ") ");
|
||||
sql.append("ORDER BY NOMB_EMPRESA, ESTADO, UF, FECHOR_VENTA, NUMFOLIOSISTEMA");
|
||||
|
|
|
|||
|
|
@ -91,7 +91,6 @@ public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio {
|
|||
|
||||
DevolucaoBilhetes db = new DevolucaoBilhetes();
|
||||
db.setFechorVenta((String) rset.getObject("FECHOR_VENTA"));
|
||||
db.setIcms((BigDecimal) rset.getObject("ICMS"));
|
||||
db.setEmpresaId(rset.getObject("EMPRESA_ID") == null ? null : ((BigDecimal) rset.getObject("EMPRESA_ID")).intValue());
|
||||
db.setEmpresa((String) rset.getObject("NOMB_EMPRESA"));
|
||||
db.setNumpuntoventa((String) rset.getObject("NUMPUNTOVENTA"));
|
||||
|
|
@ -100,10 +99,7 @@ public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio {
|
|||
db.setTotalQtdeBilhetes(rset.getInt("TOTAL_QTDE_BILHETE"));
|
||||
db.setPrecioBase((BigDecimal) rset.getObject("PRECIOBASE"));
|
||||
db.setPrecioPagado((BigDecimal) rset.getObject("PRECIOPAGADO"));
|
||||
|
||||
BigDecimal valorIcms = BigDecimal.ZERO;
|
||||
valorIcms = db.getPrecioPagado().multiply(db.getIcms().divide(BigDecimal.valueOf(100)));
|
||||
db.setValorIcms(valorIcms);
|
||||
db.setValorContabil(db.getTotalBilhete());
|
||||
|
||||
lsDev.add(db);
|
||||
}
|
||||
|
|
@ -125,7 +121,7 @@ public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio {
|
|||
sql.append(" E.EMPRESA_ID AS EMPRESA_ID, ");
|
||||
sql.append(" PTV.NUMPUNTOVENTA AS NUMPUNTOVENTA, ");
|
||||
sql.append(" PTV.NOMBPUNTOVENTA AS NOMBPUNTOVENTA, ");
|
||||
sql.append(" NVL(EI.PORCREDBASEICMS,0) AS ICMS, ");
|
||||
|
||||
sql.append(" TO_CHAR(BORI.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_VENTA, ");
|
||||
sql.append(" SUM(NVL(B.PRECIOBASE,0)) AS PRECIOBASE, ");
|
||||
sql.append(" SUM(NVL(B.PRECIOPAGADO,0)) AS PRECIOPAGADO, ");
|
||||
|
|
@ -135,15 +131,27 @@ public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio {
|
|||
sql.append("INNER JOIN MARCA M ON M.MARCA_ID = B.MARCA_ID AND M.ACTIVO = 1 ");
|
||||
sql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ");
|
||||
sql.append("INNER JOIN PUNTO_VENTA PTV ON PTV.PUNTOVENTA_ID = B.PUNTOVENTA_ID ");
|
||||
sql.append("INNER JOIN PARADA ORIGEM ON (B.ORIGEN_ID = ORIGEM.PARADA_ID ) ");
|
||||
sql.append("INNER JOIN PARADA DESTINO ON (B.DESTINO_ID = DESTINO.PARADA_ID ) ");
|
||||
sql.append("INNER JOIN CIUDAD CO ON (CO.CIUDAD_ID = ORIGEM.CIUDAD_ID ) ");
|
||||
sql.append("INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DESTINO.CIUDAD_ID ) ");
|
||||
sql.append("INNER JOIN PARADA ORI ON (B.ORIGEN_ID = ORI.PARADA_ID ) ");
|
||||
sql.append("INNER JOIN PARADA DES ON (B.DESTINO_ID = DES.PARADA_ID ) ");
|
||||
sql.append("INNER JOIN CIUDAD CO ON (CO.CIUDAD_ID = ORI.CIUDAD_ID ) ");
|
||||
sql.append("INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DES.CIUDAD_ID ) ");
|
||||
sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID ");
|
||||
sql.append("LEFT JOIN FISCAL_R4 R4 ON R4.BOLETO_ID = B.BOLETOORIGINAL_ID ");
|
||||
sql.append("LEFT JOIN EMPRESA_IMPOSTO EI ON EST.ESTADO_ID = EI.ESTADO_ID ");
|
||||
sql.append(" AND EI.EMPRESA_ID = M.EMPRESA_ID ");
|
||||
sql.append(" AND EI.ACTIVO = 1 ");
|
||||
|
||||
sql.append("LEFT JOIN ALIAS_SERVICO S ON S.ORIGEN_ID = B.ORIGEN_ID ");
|
||||
sql.append(" AND S.DESTINO_ID = B.DESTINO_ID AND (S.CORRIDA_ID = B.CORRIDA_ID OR S.CORRIDA_ID IS NULL) ");
|
||||
sql.append(" AND S.RUTA_ID = B.RUTA_ID ");
|
||||
sql.append("LEFT JOIN PARADA POS ON POS.PARADA_ID = S.ALIASORIGEN_ID ");
|
||||
sql.append("LEFT JOIN CIUDAD COS ON COS.CIUDAD_ID = POS.CIUDAD_ID ");
|
||||
sql.append("LEFT JOIN ESTADO EOS ON EOS.ESTADO_ID = COS.ESTADO_ID ");
|
||||
sql.append("LEFT JOIN PARADA PDS ON PDS.PARADA_ID = S.ALIASDESTINO_ID ");
|
||||
sql.append("LEFT JOIN CIUDAD CDS ON CDS.CIUDAD_ID = PDS.CIUDAD_ID ");
|
||||
sql.append("LEFT JOIN ESTADO EDS ON EDS.ESTADO_ID = CDS.ESTADO_ID ");
|
||||
sql.append("JOIN INSCRICAO_ESTADUAL IE ON E.EMPRESA_ID = IE.EMPRESA_ID ");
|
||||
sql.append(" AND IE.ESTADO_ID = COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) AND IE.ACTIVO = 1 ");
|
||||
sql.append("JOIN EMPRESA_IMPOSTO EI ON EI.EMPRESA_ID = E.EMPRESA_ID ");
|
||||
sql.append(" AND EI.ESTADO_ID = COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) AND EI.ACTIVO = 1 ");
|
||||
|
||||
sql.append("LEFT JOIN AIDF AIDF ON AIDF.AIDF_ID = B.AIDF_ID ");
|
||||
sql.append("LEFT JOIN BOLETO BORI ON BORI.BOLETO_ID = B.BOLETOORIGINAL_ID ");
|
||||
sql.append("WHERE B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) ");
|
||||
|
|
@ -171,14 +179,13 @@ public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio {
|
|||
}
|
||||
|
||||
sql.append("AND B.CATEGORIA_ID NOT IN (SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = 'GRATUIDADE_CRIANCA') ");
|
||||
sql.append(estados == null ? "" : "AND EST.ESTADO_ID IN (" + estados + ") ");
|
||||
sql.append(estados == null ? "" : "AND COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) IN (" + estados + ") ");
|
||||
sql.append(puntoVentas == null ? "" : "AND PTV.PUNTOVENTA_ID IN (" + puntoVentas + ") ");
|
||||
sql.append(empresaId == null ? "" : "AND E.EMPRESA_ID IN (" + empresaId + ") ");
|
||||
sql.append("GROUP BY E.NOMBEMPRESA, ");
|
||||
sql.append(" E.EMPRESA_ID, ");
|
||||
sql.append(" PTV.NUMPUNTOVENTA, ");
|
||||
sql.append(" PTV.NOMBPUNTOVENTA, ");
|
||||
sql.append(" NVL(EI.PORCREDBASEICMS,0), ");
|
||||
sql.append(" TO_CHAR(BORI.FECHORVENTA, 'DD/MM/YYYY') ");
|
||||
sql.append("ORDER BY NOMB_EMPRESA, FECHOR_VENTA ");
|
||||
|
||||
|
|
|
|||
|
|
@ -141,6 +141,21 @@ public class RelatorioDevolucaoBilhetesFinanceiro extends Relatorio {
|
|||
sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID ");
|
||||
sql.append("LEFT JOIN PUNTO_VENTA PTVO ON PTVO.PUNTOVENTA_ID = B.PTOVTAVENTA_ID ");
|
||||
sql.append("LEFT JOIN BOLETO BORI ON BORI.BOLETO_ID = B.BOLETOORIGINAL_ID ");
|
||||
|
||||
sql.append("LEFT JOIN ALIAS_SERVICO S ON S.ORIGEN_ID = B.ORIGEN_ID ");
|
||||
sql.append(" AND S.DESTINO_ID = B.DESTINO_ID AND (S.CORRIDA_ID = B.CORRIDA_ID OR S.CORRIDA_ID IS NULL) ");
|
||||
sql.append(" AND S.RUTA_ID = B.RUTA_ID ");
|
||||
sql.append("LEFT JOIN PARADA POS ON POS.PARADA_ID = S.ALIASORIGEN_ID ");
|
||||
sql.append("LEFT JOIN CIUDAD COS ON COS.CIUDAD_ID = POS.CIUDAD_ID ");
|
||||
sql.append("LEFT JOIN ESTADO EOS ON EOS.ESTADO_ID = COS.ESTADO_ID ");
|
||||
sql.append("LEFT JOIN PARADA PDS ON PDS.PARADA_ID = S.ALIASDESTINO_ID ");
|
||||
sql.append("LEFT JOIN CIUDAD CDS ON CDS.CIUDAD_ID = PDS.CIUDAD_ID ");
|
||||
sql.append("LEFT JOIN ESTADO EDS ON EDS.ESTADO_ID = CDS.ESTADO_ID ");
|
||||
sql.append("JOIN INSCRICAO_ESTADUAL IE ON E.EMPRESA_ID = IE.EMPRESA_ID ");
|
||||
sql.append(" AND IE.ESTADO_ID = COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) AND IE.ACTIVO = 1 ");
|
||||
sql.append("JOIN EMPRESA_IMPOSTO EI ON EI.EMPRESA_ID = E.EMPRESA_ID ");
|
||||
sql.append(" AND EI.ESTADO_ID = COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) AND EI.ACTIVO = 1 ");
|
||||
|
||||
sql.append("JOIN USUARIO U ON U.USUARIO_ID = B.USUARIO_ID ");
|
||||
sql.append("WHERE B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) ");
|
||||
sql.append("AND B.INDSTATUSBOLETO = 'C' ");
|
||||
|
|
@ -167,7 +182,7 @@ public class RelatorioDevolucaoBilhetesFinanceiro extends Relatorio {
|
|||
}
|
||||
|
||||
sql.append("AND B.CATEGORIA_ID NOT IN (SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = 'GRATUIDADE_CRIANCA') ");
|
||||
sql.append(estados == null ? "" : "AND EST.ESTADO_ID IN (" + estados + ") ");
|
||||
sql.append(estados == null ? "" : "AND COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) IN (" + estados + ") ");
|
||||
sql.append(puntoVentas == null ? "" : "AND PTV.PUNTOVENTA_ID IN (" + puntoVentas + ") ");
|
||||
sql.append(empresaId == null ? "" : "AND E.EMPRESA_ID IN (" + empresaId + ") ");
|
||||
sql.append("ORDER BY NOMB_EMPRESA, FECHOR_VENTA");
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,7 +1,7 @@
|
|||
<?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="RelatorioDevolucaoBilhetes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
|
||||
<property name="ireport.zoom" value="1.0"/>
|
||||
<property name="ireport.x" value="47"/>
|
||||
<property name="ireport.zoom" value="1.5"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
|
||||
<style name="table">
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
<field name="estadoId" class="java.lang.Integer"/>
|
||||
<field name="uf" class="java.lang.String"/>
|
||||
<field name="fechorVenta" class="java.lang.String"/>
|
||||
<field name="icms" class="java.math.BigDecimal"/>
|
||||
<field name="icmsInterestadual" class="java.math.BigDecimal"/>
|
||||
<field name="valorIcms" class="java.math.BigDecimal"/>
|
||||
<field name="empresaId" class="java.lang.Integer"/>
|
||||
<field name="empresa" class="java.lang.String"/>
|
||||
|
|
@ -61,6 +61,8 @@
|
|||
<field name="valorOutras" class="java.math.BigDecimal"/>
|
||||
<field name="fechorDevolucao" class="java.lang.String"/>
|
||||
<field name="estado" class="java.lang.String"/>
|
||||
<field name="icmsIntermunicipal" class="java.math.BigDecimal"/>
|
||||
<field name="tributacaoimportacao" class="java.math.BigDecimal"/>
|
||||
<variable name="precioPagado_1" class="java.math.BigDecimal" resetType="Group" resetGroup="data_group" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{precioPagado}]]></variableExpression>
|
||||
</variable>
|
||||
|
|
@ -419,7 +421,7 @@
|
|||
</graphicElement>
|
||||
</line>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="214" y="1" width="81" height="14" isPrintWhenDetailOverflows="true" uuid="1835789f-f3ff-4d8d-ba10-12c6d693b270"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="220" y="1" width="75" height="14" isPrintWhenDetailOverflows="true" uuid="1835789f-f3ff-4d8d-ba10-12c6d693b270"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
|
|
@ -506,7 +508,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.numpuntoventaOrigem}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="155" y="1" width="59" height="14" isPrintWhenDetailOverflows="true" uuid="fc142d15-a328-4187-89dc-9d8d4f3dd270"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="155" y="1" width="65" height="14" isPrintWhenDetailOverflows="true" uuid="fc142d15-a328-4187-89dc-9d8d4f3dd270"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
|
|
@ -533,7 +535,7 @@
|
|||
<detail>
|
||||
<band height="14">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement x="214" y="0" width="81" height="14" uuid="a34502fa-62b7-44b6-9218-90034054b7ac"/>
|
||||
<reportElement x="220" y="0" width="75" height="14" uuid="a34502fa-62b7-44b6-9218-90034054b7ac"/>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
|
|
@ -565,7 +567,7 @@
|
|||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$F{tributacaoimportacao} == null ? $F{icmsInterestadual} : $F{tributacaoimportacao}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00">
|
||||
<reportElement x="584" y="0" width="45" height="14" uuid="6772d6a9-3611-4cb6-9c3b-f78dc3fb5dc0"/>
|
||||
|
|
@ -616,8 +618,8 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{numpuntoventaOrigem}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement x="155" y="0" width="59" height="14" uuid="c7b4a542-1cfc-4646-a423-53c5ea12d4f3"/>
|
||||
<textField pattern="" isBlankWhenNull="true">
|
||||
<reportElement x="155" y="0" width="65" height="14" uuid="c7b4a542-1cfc-4646-a423-53c5ea12d4f3"/>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,7 +1,7 @@
|
|||
<?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="RelatorioDevolucaoBilhetesConsolidado" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
|
||||
<property name="ireport.zoom" value="2.0"/>
|
||||
<property name="ireport.x" value="926"/>
|
||||
<property name="ireport.zoom" value="1.0"/>
|
||||
<property name="ireport.x" value="37"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
|
||||
<style name="table">
|
||||
|
|
@ -40,29 +40,22 @@
|
|||
<field name="precioBase" class="java.math.BigDecimal"/>
|
||||
<field name="uf" class="java.lang.String"/>
|
||||
<field name="fechorVenta" class="java.lang.String"/>
|
||||
<field name="icms" class="java.math.BigDecimal"/>
|
||||
<field name="valorIcms" class="java.math.BigDecimal"/>
|
||||
<field name="empresaId" class="java.lang.Integer"/>
|
||||
<field name="empresa" class="java.lang.String"/>
|
||||
<field name="totalBilhete" class="java.math.BigDecimal"/>
|
||||
<field name="numpuntoventa" class="java.lang.String"/>
|
||||
<field name="totalQtdeBilhetes" class="java.lang.Integer"/>
|
||||
<field name="nombpuntoventa" class="java.lang.String"/>
|
||||
<field name="tributacaoimportacao" class="java.math.BigDecimal"/>
|
||||
<variable name="precioPagado_1" class="java.math.BigDecimal" resetType="Group" resetGroup="data_group" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{precioPagado}]]></variableExpression>
|
||||
</variable>
|
||||
<variable name="valorIcms_1" class="java.math.BigDecimal" resetType="Group" resetGroup="data_group" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{valorIcms}]]></variableExpression>
|
||||
</variable>
|
||||
<variable name="qtdeBilhetes" class="java.lang.Integer" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{totalQtdeBilhetes}]]></variableExpression>
|
||||
</variable>
|
||||
<variable name="precioPagado_total" class="java.math.BigDecimal" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{precioPagado}]]></variableExpression>
|
||||
</variable>
|
||||
<variable name="valorIcms_total" class="java.math.BigDecimal" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{valorIcms}]]></variableExpression>
|
||||
</variable>
|
||||
<variable name="vTotalBilhete" class="java.math.BigDecimal" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{totalBilhete}]]></variableExpression>
|
||||
</variable>
|
||||
|
|
@ -116,18 +109,11 @@
|
|||
<textElement textAlignment="Right">
|
||||
<font size="9"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{precioPagado_1}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$V{vSubTotalBilhete}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement x="1" y="0" width="800" height="1" uuid="eb29c074-35dc-47d8-855b-78b95676b7ae"/>
|
||||
</line>
|
||||
<textField pattern="###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="728" y="2" width="72" height="13" uuid="6e65196e-b844-4c3d-9697-44aadad52344"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="9"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{valorIcms_1}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="1" y="1" width="139" height="13" uuid="bbb5fed7-d553-42f3-9d90-4e548e0b7b38"/>
|
||||
<textElement>
|
||||
|
|
@ -316,22 +302,6 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.baseCalc}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement mode="Transparent" x="670" y="1" width="58" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="e647ff9e-f7e2-4c90-a75f-d831980391b6"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.aliquota}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement mode="Transparent" x="728" y="1" width="72" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="a1a4be94-54f7-42f0-bdd3-5b0b2d6a37c4"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.icms}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="540" y="1" width="70" height="14" uuid="ed400846-62e0-4199-8c0d-c4b7741d934c"/>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
|
|
@ -376,7 +346,7 @@
|
|||
<textElement textAlignment="Right">
|
||||
<font size="9"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{precioPagado}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$F{totalBilhete}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=" ###0.00">
|
||||
<reportElement x="429" y="0" width="111" height="14" uuid="a1bcec7c-0ca6-4f9f-a4c7-9757842b1b4f"/>
|
||||
|
|
@ -385,13 +355,6 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{totalBilhete}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00">
|
||||
<reportElement x="670" y="0" width="58" height="14" uuid="3285bf53-66f1-4dc2-b3db-d12875efa546"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="9"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00">
|
||||
<reportElement x="610" y="0" width="60" height="14" uuid="6772d6a9-3611-4cb6-9c3b-f78dc3fb5dc0"/>
|
||||
<textElement textAlignment="Right">
|
||||
|
|
@ -399,13 +362,6 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{precioPagado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern=" ###0.00" isBlankWhenNull="true">
|
||||
<reportElement x="728" y="0" width="72" height="14" uuid="e948b0e2-03c4-47c9-91f1-90d3a3fc4bf4"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="9"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{valorIcms}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement x="1" y="0" width="85" height="14" uuid="74a5a183-6fe2-4f22-8b51-b54197aa3582"/>
|
||||
<textElement>
|
||||
|
|
@ -466,7 +422,7 @@
|
|||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="9"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{precioPagado_total}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$V{vTotalBilhete}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="610" y="1" width="60" height="14" uuid="7c3ce565-f549-48d2-815d-9b4d7a39b1ca"/>
|
||||
|
|
@ -475,13 +431,6 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{precioPagado_total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="728" y="2" width="72" height="14" uuid="7a2dbe9b-868e-46db-b3b3-6e759d4dba98"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="9"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{valorIcms_total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0.00" isBlankWhenNull="false">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="429" y="1" width="108" height="14" uuid="80bddbda-0eec-4839-9510-35800aa6d742"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,7 +1,7 @@
|
|||
<?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="RelatorioDevolucaoBilhetesFinanceiro" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
|
||||
<property name="ireport.zoom" value="2.0"/>
|
||||
<property name="ireport.x" value="926"/>
|
||||
<property name="ireport.x" value="738"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
|
||||
<style name="table">
|
||||
|
|
@ -342,28 +342,28 @@
|
|||
<band height="14">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="504" y="0" width="62" height="14" isPrintWhenDetailOverflows="true" uuid="16fa1364-4eb6-418b-b5fd-e75d0db9d3ff"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
|
||||
<font size="6" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{totalBilhete}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="453" y="0" width="51" height="14" isPrintWhenDetailOverflows="true" uuid="b54f0d65-32a3-4b2d-af6f-9722bad4d290"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<textElement verticalAlignment="Top" markup="none">
|
||||
<font size="6" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{folio}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="225" y="0" width="105" height="14" isPrintWhenDetailOverflows="true" uuid="13452460-af86-49c4-a121-9f723ee74bb3"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<textElement verticalAlignment="Top" markup="none">
|
||||
<font size="6" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{descdestino}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="742" y="0" width="59" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="eeddd86f-c897-4504-947c-c5118e151df1"/>
|
||||
<textElement verticalAlignment="Middle" rotation="None" markup="none">
|
||||
<textElement verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
</textElement>
|
||||
|
|
@ -371,42 +371,42 @@
|
|||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="120" y="0" width="105" height="14" isPrintWhenDetailOverflows="true" uuid="41269147-5dc4-4e23-8668-f9b550bf238b"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<textElement verticalAlignment="Top" markup="none">
|
||||
<font size="6" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{descorigem}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="622" y="0" width="120" height="14" isPrintWhenDetailOverflows="true" uuid="58daf348-d605-4bc7-bbbc-b60113fd6bb3"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<textElement verticalAlignment="Top" markup="none">
|
||||
<font size="6" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{nombpuntoventaOrigem}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="384" y="0" width="69" height="14" isPrintWhenDetailOverflows="true" uuid="621b5322-9b59-484b-ab6b-b0a55b91b353"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<textElement verticalAlignment="Top" markup="none">
|
||||
<font size="6" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{numFolioSistema}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="330" y="0" width="54" height="14" isPrintWhenDetailOverflows="true" uuid="d898f319-976b-4ffa-8dc1-0aa359f2fc5f"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<textElement verticalAlignment="Top" markup="none">
|
||||
<font size="6" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{fechorVenta}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="14" isPrintWhenDetailOverflows="true" uuid="1b2738e1-26b5-4782-a511-477ceb95bfff"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<textElement verticalAlignment="Top" markup="none">
|
||||
<font size="6" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="568" y="0" width="54" height="14" isPrintWhenDetailOverflows="true" uuid="df83e877-1095-478a-8766-0c0ca39a357e"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<textElement verticalAlignment="Top" markup="none">
|
||||
<font size="6" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{fechorDevolucao}]]></textFieldExpression>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,9 @@ public class DevolucaoBilhetes {
|
|||
private Integer estadoId;
|
||||
private String estado;
|
||||
private String uf;
|
||||
private BigDecimal icms;
|
||||
private BigDecimal icmsInterestadual;
|
||||
private BigDecimal icmsIntermunicipal;
|
||||
private BigDecimal tributacaoimportacao;
|
||||
private BigDecimal valorIcms;
|
||||
private BigDecimal porcredbaseicms;
|
||||
private String fechorVenta;
|
||||
|
|
@ -123,14 +125,6 @@ public class DevolucaoBilhetes {
|
|||
this.uf = uf;
|
||||
}
|
||||
|
||||
public BigDecimal getIcms() {
|
||||
return icms;
|
||||
}
|
||||
|
||||
public void setIcms(BigDecimal icms) {
|
||||
this.icms = icms;
|
||||
}
|
||||
|
||||
public String getFechorVenta() {
|
||||
return fechorVenta;
|
||||
}
|
||||
|
|
@ -407,4 +401,28 @@ public class DevolucaoBilhetes {
|
|||
this.importetaxaembarque = importetaxaembarque;
|
||||
}
|
||||
|
||||
public BigDecimal getIcmsInterestadual() {
|
||||
return icmsInterestadual;
|
||||
}
|
||||
|
||||
public void setIcmsInterestadual(BigDecimal icmsInterestadual) {
|
||||
this.icmsInterestadual = icmsInterestadual;
|
||||
}
|
||||
|
||||
public BigDecimal getIcmsIntermunicipal() {
|
||||
return icmsIntermunicipal;
|
||||
}
|
||||
|
||||
public void setIcmsIntermunicipal(BigDecimal icmsIntermunicipal) {
|
||||
this.icmsIntermunicipal = icmsIntermunicipal;
|
||||
}
|
||||
|
||||
public BigDecimal getTributacaoimportacao() {
|
||||
return tributacaoimportacao;
|
||||
}
|
||||
|
||||
public void setTributacaoimportacao(BigDecimal tributacaoimportacao) {
|
||||
this.tributacaoimportacao = tributacaoimportacao;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1483,11 +1483,17 @@ public class ConferenciaController extends MyGenericForwardComposer {
|
|||
}
|
||||
|
||||
private Boolean isMaloteRecebido() {
|
||||
return conferencia.getIndmaloterecebido() != null && conferencia.getIndmaloterecebido();
|
||||
if(conferencia != null) {
|
||||
return conferencia.getIndmaloterecebido() != null && conferencia.getIndmaloterecebido();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private Boolean isMaloteRecebido(Conferencia c){
|
||||
return c.getIndmaloterecebido() != null && c.getIndmaloterecebido();
|
||||
if(c != null) {
|
||||
return c.getIndmaloterecebido() != null && c.getIndmaloterecebido();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void onClick$btnCerrar() throws InterruptedException {
|
||||
|
|
|
|||
|
|
@ -566,9 +566,6 @@
|
|||
<column width="80%" />
|
||||
</columns>
|
||||
<rows>
|
||||
<row spans="2">
|
||||
<label value="${c:l('editarEmpresaController.comissaoTipoEventoExtraConferenciaFisica.label')}"/>
|
||||
</row>
|
||||
<row>
|
||||
<label id="lblTipoDC"
|
||||
value="${c:l('editarEmpresaController.lblTipoDC.label')}" />
|
||||
|
|
@ -579,6 +576,9 @@
|
|||
<radio id="rdgTipoDCCredito" label="${c:l('editarEmpresaController.lblTipoDC.credito')}" />
|
||||
</radiogroup>
|
||||
</row>
|
||||
<row spans="2">
|
||||
<label value="${c:l('editarEmpresaController.comissaoTipoEventoExtraConferenciaFisica.label')}"/>
|
||||
</row>
|
||||
<row>
|
||||
<label id="lblTipoEventoExtras"
|
||||
value="${c:l('editarEmpresaController.comissaoTipoEventoExtra.label')}" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue