diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java index 3384b3841..5130c0545 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java @@ -184,8 +184,11 @@ public class RelatorioBPe extends Relatorio { sql.append(" AND bol.FECHORVENTA >= TO_DATE(:dataInicio,'DD/MM/YYYY HH24:MI:SS') "); sql.append(" AND bol.FECHORVENTA <= TO_DATE(:dataFinal,'DD/MM/YYYY HH24:MI:SS') "); }else { - sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) >= TO_DATE(:dataInicio,'DD/MM/YYYY HH24:MI:SS') "); - sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) <= TO_DATE(:dataFinal,'DD/MM/YYYY HH24:MI:SS') "); +// sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) >= TO_DATE(:dataInicio,'DD/MM/YYYY HH24:MI:SS') "); +// sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) <= TO_DATE(:dataFinal,'DD/MM/YYYY HH24:MI:SS') "); + //Mantis 17952 + sql.append(" AND (bpe.dt_venda >= TO_DATE(:dataInicio, 'DD/MM/YYYY HH24:MI:SS' ) OR bpe.dt_venda is null and bol.fechorventa >= TO_DATE(:dataInicio, 'DD/MM/YYYY HH24:MI:SS')) "); + sql.append(" AND (bpe.dt_venda <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS' ) OR bpe.dt_venda is null and bol.fechorventa <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS' ))"); } }