diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java index d927efc3b..8cd1d8496 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java @@ -16,7 +16,6 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DevolucaoBilhetes; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; @@ -221,9 +220,10 @@ 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.ACFISCAL) AS AIDF, "); + sql.append("SELECT COALESCE(COALESCE(BORI.SERIEIMPFISCALORIGINAL,BORI.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 ELSE B.NUMSERIEPREIMPRESA END AS SERIE_SUBSERIE, "); + 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(" B.NUMFOLIOPREIMPRESO AS FOLIO, "); sql.append(" B.PRECIOBASE AS PRECIOBASE, "); sql.append(" E.NOMBEMPRESA AS NOMB_EMPRESA, "); @@ -278,7 +278,6 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append("WHERE B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) "); sql.append("AND B.INDSTATUSBOLETO = 'C' "); sql.append("AND B.INDCANCELACION = 1 "); - sql.append("AND BORI.SERIEIMPFISCAL IS NOT NULL "); if(isApenasBilhetesImpressos) { sql.append("AND B.NUMFOLIOPREIMPRESO IS NOT NULL "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper index 6c9072ae5..1821d05f5 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml index e2996b431..91143a9b3 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml @@ -1,6 +1,6 @@ - + @@ -105,14 +105,14 @@ - + - +