diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
index f725d6b48..d4691b1f3 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
@@ -95,7 +95,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		ResultSet rset = null;
 
 		StringBuilder sql = new StringBuilder();
-		sql.append("select r4.numserie20                          as numImpressora, ");
+		sql.append("select distinct ");
+		sql.append("       r4.numserie20                          as numImpressora, ");
 		sql.append("       coalesce(r4.coo, b.numfoliopreimpreso) as coo, ");
 		sql.append("       b.boleto_id                            as boletoId, ");
 		sql.append("       e.empresa_id                           as empresaId, ");
@@ -103,9 +104,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sql.append("       to_char(b.fechorventa, 'yyyyMMdd')     as dataEmissao, ");
 		sql.append("       b.preciopagado                         as valorTotal, ");
 		sql.append("       co.codibge                             as origenId, ");
-		sql.append("       eo.cveestado                           as origenUf, ");
+		sql.append("       eo.codibge                             as origenUf, ");
 		sql.append("       cd.codibge                             as destinoId, ");
-		sql.append("       ed.cveestado                           as destinoUf, ");
+		sql.append("       ed.codibge                             as destinoUf, ");
 		sql.append("       r5.totparcial                          as repTributado, ");
 		sql.append("       b.preciopagado                         as valorItem, ");
 		sql.append("       r5.tipopassagem                        as tipoPassagem, ");
@@ -163,39 +164,6 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sql.append(isEstadoTodos(estadoId) ? "" : " AND eo.estado_id = ? ");
 		sql.append("       AND b.tipoventa_id = 3 ");
 		sql.append("       AND (b.preciopagado > 0 OR b.importetaxaembarque > 0 OR b.importepedagio > 0) ");
-		sql.append("GROUP BY r4.numserie20, ");
-		sql.append("         COALESCE(r4.coo, b.numfoliopreimpreso), ");
-		sql.append("         b.boleto_id, ");
-		sql.append("         e.empresa_id, ");
-		sql.append("         e.nombempresa, ");
-		sql.append("         TO_CHAR(b.fechorventa, 'yyyyMMdd'), ");
-		sql.append("         b.preciopagado, ");
-		sql.append("         co.codibge, ");
-		sql.append("         cd.codibge, ");
-		sql.append("         r5.totparcial, ");
-		sql.append("         b.preciopagado, ");
-		sql.append("         r5.tipopassagem, ");
-		sql.append("         r5.numitem, ");
-		sql.append("         r5.codproduto, ");
-		sql.append("         b.numseriepreimpresa, ");
-		sql.append("         eio.icms, ");
-		sql.append("         eio.porctributo, ");
-		sql.append("         eo.estado_id, ");
-		sql.append("         ed.estado_id, ");
-		sql.append("         subserie, ");
-		sql.append("         docfiscal, ");
-		sql.append("         b.importetaxaembarque, ");
-		sql.append("         b.importepedagio, ");
-		sql.append("         b.importeoutros, ");
-		sql.append("         b.importeseguro, ");
-		sql.append("         fi.numserie, ");
-		sql.append("         fi.modelo, ");
-		sql.append("         r4.usuario_id, ");
-		sql.append("		 eo.cveestado, ");
-		sql.append("		 ed.cveestado, ");
-		sql.append("		 b.motivocancelacion_id, ");
-		sql.append("		 b.indstatusboleto, ");
-		sql.append("		 cs.descclase ");
 		sql.append("ORDER  BY dataEmissao, coo, modeloImpressora ");
 
 		List<ImportacionManualFiscalVO> listManuais = new ArrayList<ImportacionManualFiscalVO>();
@@ -227,9 +195,15 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 			item.setTipoPassagem(rset.getString("tipoPassagem"));
 			item.setValorItem(rset.getBigDecimal("valorItem"));
 			item.setOrigenId(rset.getInt("origenId"));
-			item.setOrigenUf(rset.getString("origenUf"));
+			
+			Integer origenIbge = rset.getInt("origenUf");
+			item.setOrigenUf(origenIbge == null ? null : origenIbge.toString());
+			
 			item.setDestinoId(rset.getInt("destinoId"));
-			item.setDestinoUf(rset.getString("destinoUf"));
+			
+			Integer destinoIbge = rset.getInt("destinoUf");
+			item.setDestinoUf(destinoIbge == null ? null : destinoIbge.toString());			
+			
 			item.setModeloImpressora(rset.getString("modeloImpressora"));
 			item.setNumCaixa(rset.getString("numCaixa"));
 			item.setStatus(rset.getString("status"));
@@ -530,9 +504,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sql.append("	       r4.boleto_id as boletoId, ");
 		sql.append("	       me.empresa_id as empresaId, ");
 		sql.append("	       co.codibge as origenId, ");
-		sql.append("           eo.cveestado as origenUf, ");
+		sql.append("           eo.codibge as origenUf, ");
 		sql.append("           cd.codibge as destinoId, ");
-		sql.append("           ed.cveestado as destinoUf, ");
+		sql.append("           ed.codibge as destinoUf, ");
 		sql.append("	       fi.numcnpj as cnpjImpressora, ");
 		sql.append("           fi.numserie as numpdv, ");
 		sql.append("	       r5.totparcial as repTributado, ");
@@ -642,9 +616,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sql.append("				b.boleto_id AS boletoId, ");
 		sql.append("				m.empresa_id AS empresaId, ");
 		sql.append("				co.codibge AS origenId, ");
-		sql.append("				eo.cveestado AS origenUf, ");
+		sql.append("				eo.codibge AS origenUf, ");
 		sql.append("				cd.codibge AS destinoId, ");
-		sql.append("				ed.cveestado AS destinoUf, ");
+		sql.append("				ed.codibge AS destinoUf, ");
 		sql.append("				fi.numcnpj AS cnpjImpressora, ");
 		sql.append("				fi.numserie AS numpdv, ");
 		sql.append("				r5.totparcial AS repTributado, ");
@@ -706,9 +680,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sql.append("				b.boleto_id AS boletoId, ");
 		sql.append("				m.empresa_id AS empresaId, ");
 		sql.append("				co.codibge AS origenId, ");
-		sql.append("				eo.cveestado AS origenUf, ");
+		sql.append("				eo.codibge AS origenUf, ");
 		sql.append("				cd.codibge AS destinoId, ");
-		sql.append("				ed.cveestado AS destinoUf, ");
+		sql.append("				ed.codibge AS destinoUf, ");
 		sql.append("				fi.numcnpj AS cnpjImpressora, ");
 		sql.append("				fi.numserie AS numpdv, ");
 		sql.append("				r5.totparcial AS repTributado, ");
@@ -1038,9 +1012,15 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 			item.setCnpjCliente(columns.contains("cnpjcliente") ? rset.getString("cnpjCliente") : null);
 			item.setCnpjImpressora(columns.contains("cnpjimpressora") ? rset.getString("cnpjImpressora") : null);
 			item.setOrigenId(columns.contains("origenid") ? rset.getInt("origenId") : null);
-			item.setOrigenUf(columns.contains("origenuf") ? rset.getString("origenUf") : null);
+			
+			Integer origenIbge = (columns.contains("origenuf") ? rset.getInt("origenUf") : null);
+			item.setOrigenUf(origenIbge == null ? null : origenIbge.toString());
+			
 			item.setDestinoId(columns.contains("destinoid") ? rset.getInt("destinoId") : null);
-			item.setDestinoUf(columns.contains("destinouf") ? rset.getString("destinoUf") : null);
+			
+			Integer destinoIbge = (columns.contains("destinouf") ? rset.getInt("destinoUf") : null);
+			item.setDestinoUf(destinoIbge == null ? null : destinoIbge.toString());
+			
 			item.setNumpdv(columns.contains("numpdv") ? rset.getString("numpdv") : null);
 			item.setNumItem(columns.contains("numitem") ? rset.getString("numItem") : null);
 			item.setCodProduto(columns.contains("codproduto") ? rset.getString("codProduto") : null);