From 7233fa76103ce021c6a8dbe8f943744e3b45d250 Mon Sep 17 00:00:00 2001 From: "alexandre.lima" Date: Wed, 18 Oct 2017 12:27:27 +0000 Subject: [PATCH] Fixes Bug #9940 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@75120 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioBilhetesVendidos.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java index d81b15b35..248f8823f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java @@ -80,11 +80,11 @@ public class RelatorioBilhetesVendidos extends Relatorio { } if (parametros.get("STATUS") != null) { if (parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) { - sql.append(" AND ((b.INDSTATUSBOLETO = 'C' AND B.INDCANCELACION = 1 and b.BOLETOORIGINAL_ID is not null AND B.MOTIVOCANCELACION_ID IS NOT NULL) OR (b.INDSTATUSBOLETO = 'V' AND B.INDCANCELACION = 0 and b.BOLETOORIGINAL_ID is null AND B.MOTIVOCANCELACION_ID IS NULL)) "); + sql.append(" AND ((b.INDSTATUSBOLETO = 'C' AND B.MOTIVOCANCELACION_ID IS NOT NULL) OR (b.INDSTATUSBOLETO = 'V' AND B.MOTIVOCANCELACION_ID IS NULL)) "); } else if (parametros.get("STATUS").toString().contains("C")) { - sql.append(" AND b.INDSTATUSBOLETO = 'C' AND B.INDCANCELACION = 1 and b.BOLETOORIGINAL_ID is not null AND B.MOTIVOCANCELACION_ID IS NOT NULL"); + sql.append(" AND b.INDSTATUSBOLETO = 'C' AND B.MOTIVOCANCELACION_ID IS NOT NULL"); } else if (parametros.get("STATUS").toString().contains("V")) { - sql.append(" AND b.INDSTATUSBOLETO = 'V' AND B.INDCANCELACION = 0 and b.BOLETOORIGINAL_ID is null AND B.MOTIVOCANCELACION_ID IS NULL"); + sql.append(" AND b.INDSTATUSBOLETO = 'V' AND B.MOTIVOCANCELACION_ID IS NULL"); } } sql.append(" and B.BOLETOORIGINAL_ID is null ");