diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
index d05dcd984..f73a6d85d 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
@@ -3858,19 +3858,21 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sql.append("  '' as nombPuntoVenta, ");
 		sql.append("  '' as numPuntoVenta, ");
 		sql.append("  ie.numinscricaoestadual as ieEmpresa, ");
-		sql.append("  coalesce(eos.estado_id, eo.estado_id) as estadoId, ");
-		sql.append("  coalesce(eis.icms, ei.icms) as icmsInterestadual, ");
-		sql.append("  coalesce(eis.icmsim, ei.icmsim) as icmsIntermunicipal, ");
-		sql.append("  coalesce(eos.cveestado, eo.cveestado) as estadoOrigem, ");
-		sql.append("  coalesce(eds.cveestado, ed.cveestado) as estadoDestino, ");
-		sql.append("  coalesce(cos.codibge, co.codibge) as municipioOrigem, ");
-		sql.append("  case when((coalesce(eos.cveestado, eo.cveestado)) = (coalesce(eds.cveestado, ed.cveestado)))  then 0 else 1 end as isInterEstadual, ");
-		sql.append("  eis.porcredbaseicms as redBaseCalcIcms, ");
-		sql.append("  eis.porcredmunicipal as porcRedMunicipal, ");
-		sql.append("  eis.porcredestadual as porcRedEstadual, ");
-		sql.append("  eis.tributacaoimportacao as tributacaoImportacao, ");
-		sql.append("  case when (coalesce(pos.regionmetropolitana_id, po.regionmetropolitana_id, -1) = ");
-		sql.append("               coalesce(pds.regionmetropolitana_id, pd.regionmetropolitana_id, -2)) then 1 else 0 end as isenta, ");
+		sql.append("  (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) as estadoId,");
+		sql.append("  (case when s.aliasorigen_id is null then ei.icms else eis.icms end) as icmsInterestadual,");
+		sql.append("  (case when s.aliasorigen_id is null then ei.icmsim else eis.icmsim end) as icmsIntermunicipal,");
+		sql.append("  (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) as estadoOrigem,");
+		sql.append("  (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) as estadoDestino,");
+		sql.append("  (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as municipioOrigem,");
+		sql.append("  case when ( (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = ");
+		sql.append("         (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) )  then 0 else 1 end as isInterEstadual, ");
+		sql.append("  (case when s.aliasorigen_id is null then ei.porcredbaseicms else eis.porcredbaseicms end) as redBaseCalcIcms,");
+		sql.append("  (case when s.aliasorigen_id is null then ei.porcredmunicipal else eis.porcredmunicipal end) as porcRedMunicipal,");
+		sql.append("  (case when s.aliasorigen_id is null then ei.porcredestadual else eis.porcredestadual end) as porcRedEstadual,");
+		sql.append("  (case when s.aliasorigen_id is null then ei.tributacaoimportacao else eis.tributacaoimportacao end) as tributacaoImportacao,");
+		sql.append("  (case when (coalesce(case when s.aliasorigen_id is null then po.regionmetropolitana_id ");
+		sql.append("         else pos.regionmetropolitana_id end, -1) = coalesce(case when s.aliasorigen_id is null ");
+		sql.append("         then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2)) then 1 else 0 end) as isenta, ");
 		sql.append("  coalesce(c.preciopagado, 0)  as tarifa, ");
 		sql.append("  coalesce(c.importetaxaembarque, 0) as taxaEmbarque, ");
 		sql.append("  coalesce(c.importepedagio, 0) as pedagio, ");
@@ -3923,6 +3925,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sql.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = :CVEESTADO ) ");
 		sql.append(" and c.rmd_id is null ");
 		sql.append(" order by estadoId, datamov, ecf, coo ");
+		
 		return sql.toString();
 	}