diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java index 2b5fb111c..fae697552 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java @@ -47,16 +47,16 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { StringBuilder sql = new StringBuilder(); sql.append("SELECT distinct est.cveestado as cveestado,"); + sql.append(" to_char(c.fechorventa, 'dd/mm/yyyy hh24:mi') as datavenda,"); + sql.append(" c.INDSTATUSBOLETO statuspassagem, "); sql.append(" ae.decespecie as especie, "); - sql.append(" to_char(c.fechorventa, 'dd/mm/yyyy hh24:mi:ss') as datavenda,"); sql.append(" (select min(NUMFOLIOSISTEMA) as maximo from boleto e where e.NUMOPERACION = c.NUMOPERACION) as forminicial,"); sql.append(" (select max(NUMFOLIOSISTEMA) as maximo from boleto e where e.NUMOPERACION = c.NUMOPERACION) as formfinal,"); - sql.append(" a.serie AS serie,"); - sql.append(" est.icms AS valoraliquiotaicms,"); + sql.append(" c.NUMSERIEPREIMPRESA AS serie,"); sql.append(" c.preciopagado as valorcontabil,"); sql.append(" c.preciopagado - (c.preciopagado * coalesce(ei.porcredbaseicms / 100,0))AS valorbasecalculo, "); - sql.append(" (c.preciopagado - (c.preciopagado * coalesce(ei.porcredbaseicms / 100,0)) * est.icms) / 100 AS valoricms, "); - sql.append(" c.INDSTATUSBOLETO statuspassagem "); + sql.append(" est.icms AS valoraliquiotaicms,"); + sql.append(" (c.preciopagado - (c.preciopagado * coalesce(ei.porcredbaseicms / 100,0)) * est.icms) / 100 AS valoricms "); sql.append("FROM boleto c "); sql.append("left join aidf a ON a.aidf_id = c.aidf_id "); sql.append("left join aidf_especie ae ON (a.aidfesp_id = ae.aidfesp_id) ");