diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java index 8cd1d8496..6a76ddf15 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java @@ -196,13 +196,17 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { db.setEstornoEstadual(BigDecimal.ZERO); db.setEstornoMunicipal(BigDecimal.ZERO); - if (!db.isIsenta()) { - if (isEstadual) { - db.setEstornoEstadual(baseCalculoIcms); - } else { - db.setEstornoMunicipal(baseCalculoIcms); - } + if (isEstadual) { + db.setEstornoEstadual(valorContabil); + } else { + db.setEstornoMunicipal(valorContabil); } +// if (isEstadual) { +// db.setEstornoEstadual(baseCalculoIcms); +// } else { +// db.setEstornoMunicipal(baseCalculoIcms); +// } + 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) { 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(" CASE WHEN COALESCE(BORI.SERIEIMPFISCALORIGINAL,BORI.SERIEIMPFISCAL) IS NOT NULL THEN NULL "); sql.append(" ELSE AIDF.SERIE || COALESCE(AIDF.SUBSERIE, '') END AS SERIE_SUBSERIE, "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper index 45b91c255..f39f7db57 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml index 4f893dc6e..330b69a9b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml @@ -1,8 +1,8 @@ - + - +