From eebc250de9a8d9600c1184c0aa65eec365cb4677 Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 13 Jul 2017 20:24:04 +0000 Subject: [PATCH] fixes bug #9305 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@71338 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 808b40aa4..a72a770fb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -538,9 +538,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" INNER JOIN caja cajb on (((cajb.feccorrida = caj.feccorrida) or (cajb.feccorrida is null and caj.feccorrida is null)) "); sql.append(" and ((cajb.numasiento = caj.numasiento) or (cajb.numasiento is null and caj.numasiento is null)) "); sql.append(" and cajb.numfoliosistema = caj.numfoliosistema and cajb.origen_id = caj.origen_id and cajb.destino_id=caj.destino_id "); - sql.append(" and ((cajb.tipoventa_id not in (5,12,18,81,41) "); + sql.append(" and ((cajb.tipoventa_id not in (5,12,18,81,41,49) "); sql.append(" and (cajb.indstatusboleto = 'V' or (cajb.indstatusboleto = 'T' and cajb.indreimpresion=0) )) "); - sql.append(" or (cajb.tipoventa_id in (5,12,18,81,41) and cajb.indstatusboleto = 'E')) ) "); + sql.append(" or (cajb.tipoventa_id in (5,12,18,81,41,49) and cajb.indstatusboleto = 'E')) ) "); sql.append(" INNER JOIN fiscal_r4 r4 on r4.caja_id = cajb.caja_id "); sql.append(" LEFT JOIN fiscal_r5 r5 ON r4.numserie20 = r5.numserie20 and r4.coo = r5.coo "); sql.append(" and r4.datamov = r5.datamov and r4.contador = r5.contador "); @@ -561,7 +561,6 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(isEstadoTodos ? "" : " AND eo.estado_id = ? "); sql.append(" and caj.motivocancelacion_id IN (31,32,10,37,99,36) "); sql.append(" and caj.indcancelacion = 1 "); - sql.append(" and caj.indreimpresion = 0 "); sql.append(" and caj.indstatusboleto = 'C' "); sql.append(" and r4.indcancelamento = 'N' "); sql.append(" ORDER BY r4.datamov, ");