From e44c7b2ef60782c3aad0dca4eb822b5b0d834a5d Mon Sep 17 00:00:00 2001 From: julio Date: Fri, 26 Jan 2018 18:45:12 +0000 Subject: [PATCH] fixes bug #10474 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@78384 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/dao/hibernate/FiscalHibernateDAO.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 86475b0a2..79a1ad131 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -4249,11 +4249,10 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" join estado eie on eie.estado_id = cie.estado_id "); sql.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id "); sql.append(" and ei.estado_id = coalesce(ae.estado_id, eos.estado_id) and ei.activo = 1 "); - sql.append("where c.tipoventa_id = 3 "); + sql.append("where ((c.tipoventa_id = 3 and c.indstatusboleto = 'V' and c.indreimpresion = 0) "); + sql.append(" or (c.tipoventa_id in (12,18) and c.indstatusboleto = 'E' and c.numfoliosistema = c.numfoliopreimpreso)) "); sql.append(" and (c.motivocancelacion_id is null or c.motivocancelacion_id <> 35) "); sql.append(" and c.indcancelacion = 0 "); - sql.append(" and c.preciopagado > 0 "); - sql.append(" and c.indstatusboleto = 'V' and c.indreimpresion = 0 "); sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); sql.append(" and c.feccreacion between :DATE_INICIO and :DATE_FIM "); sql.append(" and coalesce(ae.cveestado, eos.cveestado) in ( ").append(ufs).append(" ) ");