diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 365cd4231..670f67753 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -205,12 +205,13 @@ public class FiscalHibernateDAO extends GenericHibernateDAO impl sql.append(" r2.totgeral AS gtFinal, "); sql.append(" anterior.totgeral AS gtInicial "); sql.append("FROM fiscal_r2 r2 "); + sql.append(" inner join fiscal_impressora ifi "); + sql.append(" ON ifi.numserie20 = r2.numserie20 "); sql.append(" inner join fiscal_r3 r3 "); sql.append(" ON r3.crz = r2.crz "); sql.append(" AND r2.numserie20 = r3.numserie20 "); sql.append(" AND r3.datamov = r2.datamov "); - sql.append(" inner join fiscal_impressora ifi "); - sql.append(" ON ifi.numserie20 = r2.numserie20 "); + sql.append(" AND r3.fiscalimpressora_id = ifi.fiscalimpressora_id "); sql.append(" inner join fiscal_t2 t2 "); sql.append(" ON ifi.fiscalimpressora_id = t2.fiscalimpressora_id "); sql.append(" inner join empresa e "); @@ -218,6 +219,7 @@ public class FiscalHibernateDAO extends GenericHibernateDAO impl sql.append(" (SELECT numserie20, crz, totgeral "); sql.append(" FROM fiscal_r2) anterior "); sql.append("WHERE r2.datamov BETWEEN ? AND ? "); + sql.append(" AND r2.activo = 1 "); sql.append(" AND e.empresa_id = ? "); sql.append(" AND r3.totparcial not in ("); sql.append("'" + SituacaoTributaria.CANCELADO.getValue() + "'").append(", ");