From 83e9131eb56f2ace5b76363c712a544439c066bd Mon Sep 17 00:00:00 2001 From: alberto Date: Tue, 29 Aug 2017 20:45:27 +0000 Subject: [PATCH] =?UTF-8?q?Exporta=C3=A7=C3=A3o=20Fiscal=20:=20ECF=20e=20R?= =?UTF-8?q?MD=20(issue=208120)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@73275 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/dao/hibernate/FiscalHibernateDAO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 8c27b1c05..cb7445524 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -2437,7 +2437,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" left join empresa_imposto eif on eif.activo = 1 and eif.empresa_id = f.empresa_id and eif.estado_id = eof.estado_id"); sb.append(" left join inscricao_estadual ie on ie.empresa_id = f.empresa_id and ie.estado_id = eof.estado_id and ie.activo = 1"); sb.append(" left join ciudad cie on cie.ciudad_id = ie.ciudad_id"); - sb.append(" left join caja b on b.activo = 1 and b.indreimpresion = 0 and b.rmd_id = (case when coalesce(f.indcancelacion, 0) = 1 then -1 else f.rmd_id end) and b.empresacorrida_id = f.empresa_id and to_char(b.fechorventa, 'ddmmyyyy') = to_char(f.fechorfolio, 'ddmmyyyy')"); + sb.append(" left join caja b on b.activo = 1 and b.indreimpresion = 0 and b.rmd_id = (case when coalesce(f.indcancelacion, 0) = 1 then -1 else f.rmd_id end) and b.empresacorrida_id = f.empresa_id and b.foliormd = f.folio and to_char(b.fechorventa, 'ddmmyyyy') = to_char(f.fechorfolio, 'ddmmyyyy')"); sb.append(" left join parada po on po.parada_id = b.origen_id"); sb.append(" left join ciudad co on co.ciudad_id = po.ciudad_id"); sb.append(" left join estado eo on eo.estado_id = co.estado_id"); @@ -2448,6 +2448,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" left join aidf a on a.aidf_id = b.aidf_id"); sb.append(" where"); sb.append(" f.activo = 1"); + sb.append(" and f.indinactivo = 0"); sb.append(" and f.indbpr = 1"); sb.append(" and f.fechorfolio >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and f.fechorfolio <= to_date(?,'DD/MM/YYYY HH24:MI:SS')"); sb.append(" and f.empresa_id = ?");