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

fixes bug #9387 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@74163 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2017-09-22 17:44:04 +00:00
parent 593f7cbf9f
commit 3740795b7c
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
View File

@ -196,13 +196,17 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
db.setEstornoEstadual(BigDecimal.ZERO); db.setEstornoEstadual(BigDecimal.ZERO);
db.setEstornoMunicipal(BigDecimal.ZERO); db.setEstornoMunicipal(BigDecimal.ZERO);
if (!db.isIsenta()) { if (isEstadual) {
if (isEstadual) { db.setEstornoEstadual(valorContabil);
db.setEstornoEstadual(baseCalculoIcms); } else {
} else { db.setEstornoMunicipal(valorContabil);
db.setEstornoMunicipal(baseCalculoIcms);
}
} }
// if (isEstadual) {
// db.setEstornoEstadual(baseCalculoIcms);
// } else {
// db.setEstornoMunicipal(baseCalculoIcms);
// }
lsDev.add(db); lsDev.add(db);
} }
@ -220,7 +224,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
private String getSql(Integer empresaId, String puntoVentas, String estados, Date dataVendaInicial, Date dataVendaFinal, Date dataDevolucaoInicial, Date dataDevolucaoFinal, Boolean isApenasBilhetesImpressos) { private String getSql(Integer empresaId, String puntoVentas, String estados, Date dataVendaInicial, Date dataVendaFinal, Date dataDevolucaoInicial, Date dataDevolucaoFinal, Boolean isApenasBilhetesImpressos) {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("SELECT COALESCE(COALESCE(BORI.SERIEIMPFISCALORIGINAL,BORI.SERIEIMPFISCAL), AIDF.DOCFISCAL) AS AIDF, "); sql.append("SELECT COALESCE(BORI.SERIEIMPFISCAL, B.SERIEIMPFISCAL, AIDF.DOCFISCAL) AS AIDF, ");
sql.append(" COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, "); sql.append(" COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, ");
sql.append(" CASE WHEN COALESCE(BORI.SERIEIMPFISCALORIGINAL,BORI.SERIEIMPFISCAL) IS NOT NULL THEN NULL "); sql.append(" CASE WHEN COALESCE(BORI.SERIEIMPFISCALORIGINAL,BORI.SERIEIMPFISCAL) IS NOT NULL THEN NULL ");
sql.append(" ELSE AIDF.SERIE || COALESCE(AIDF.SUBSERIE, '') END AS SERIE_SUBSERIE, "); sql.append(" ELSE AIDF.SERIE || COALESCE(AIDF.SUBSERIE, '') END AS SERIE_SUBSERIE, ");

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

Binary file not shown.

12
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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.5"/> <property name="ireport.zoom" value="1.9965000000000006"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="96"/> <property name="ireport.y" value="0"/>
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/> <style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
<style name="table"> <style name="table">
<box> <box>
@ -133,7 +133,7 @@
<textElement> <textElement>
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.impEstornarInterestadual}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.impEstornarIntermunicipal}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement x="0" y="0" width="800" height="1" uuid="ddbec772-7ac5-4ca7-8bd9-f4d556cd8015"/> <reportElement x="0" y="0" width="800" height="1" uuid="ddbec772-7ac5-4ca7-8bd9-f4d556cd8015"/>
@ -143,21 +143,21 @@
<textElement> <textElement>
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.impEstornarIntermunicipal}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.impEstornarInterestadual}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="271" y="15" width="111" height="14" uuid="ac8a5a5d-6d23-445c-925f-81a506de6e5e"/> <reportElement x="271" y="15" width="111" height="14" uuid="ac8a5a5d-6d23-445c-925f-81a506de6e5e"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{vTotalEstornoIntermunicipal}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vTotalEstornoInterestadual}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="271" y="1" width="111" height="14" uuid="824c2026-e1ef-459e-88d3-a746acff0dad"/> <reportElement x="271" y="1" width="111" height="14" uuid="824c2026-e1ef-459e-88d3-a746acff0dad"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{vTotalEstornoInterestadual}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vTotalEstornoIntermunicipal}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="271" y="29" width="111" height="14" uuid="10545815-fcf1-40b9-b645-7d1e3097cf0c"/> <reportElement x="271" y="29" width="111" height="14" uuid="10545815-fcf1-40b9-b645-7d1e3097cf0c"/>