From 5890f712fc22db521f64f5802ed819ce4cb41d65 Mon Sep 17 00:00:00 2001 From: julio Date: Wed, 2 Aug 2017 17:09:21 +0000 Subject: [PATCH] fixes bug #9386 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@72190 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/dao/hibernate/FiscalHibernateDAO.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index a14c5e271..41de69873 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -3777,6 +3777,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" and e.empresa_id = ? "); sql.append(" and r4.datamov between ? and ? "); sql.append(" and coalesce(eos.cveestado, eo.cveestado) = ? "); + sql.append(" and coalesce(r4.indcancelamento, 'N') <> 'S' "); sql.append("order by estadoId, datamov, ecf, coo "); return sql.toString(); @@ -4185,6 +4186,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" and e.empresa_id = :EMPRESA_ID "); sql.append(" and r4.datamov between :STR_INICIO and :STR_FIM "); sql.append(" and coalesce(eos.cveestado, eo.cveestado) in ( ").append(ufs).append(" ) "); + sql.append(" and coalesce(r4.indcancelamento, 'N') <> 'S' "); sql.append(" "); sql.append("union "); sql.append(" "); @@ -4246,7 +4248,6 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id "); sql.append(" and ei.estado_id = coalesce(eos.estado_id, eo.estado_id) and ei.activo = 1 "); sql.append("where b.tipoventa_id = 3 "); - // sql.append(" and b.indstatusboleto = 'V' "); sql.append(" and (b.indstatusboleto like 'V' or b.indstatusboleto like 'C') "); sql.append(" and e.empresa_id = :EMPRESA_ID "); sql.append(" and b.fechorventa between :DATE_INICIO and :DATE_FIM "); @@ -4329,6 +4330,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" and caj.indcancelacion = 1 "); sql.append(" and caj.indstatusboleto = 'C' "); sql.append(" and coalesce(eos.cveestado, eo.cveestado) in ( ").append(ufs).append(" ) "); + sql.append(" and coalesce(r4.indcancelamento, 'N') <> 'S' "); sql.append(" "); sql.append("union "); sql.append(" ");