fixes bug#17952

dev:
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@99795 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago.clemente 2020-01-17 14:06:28 +00:00
parent 6a1de14dd0
commit 45aef88d15
1 changed files with 5 additions and 2 deletions

View File

@ -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' ))");
}
}