diff --git a/pom.xml b/pom.xml
index 47eeabbf6..7b56d8a97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.6.4</version>
+	<version>1.6.5</version>
 	<packaging>war</packaging>
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
index bf79527b6..565d88ec9 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
@@ -285,7 +285,7 @@ public class RelatorioPassagensAGR extends Relatorio {
 		 sql.append(" SELECT ");
 		 sql.append("   b.numfoliosistema AS numero_bilhete,                                                                   	");
 		 sql.append("   e.nombempresa AS razao_social,                                                                         	");
-		 sql.append("   e.cnpj AS cnpj,                                                                                        	");
+		 sql.append("   COALESCE(ie.cnpj, e.cnpj)   AS cnpj,                                                                  	");
 		 sql.append("   CASE                                                                                                   	");
 		 sql.append("      WHEN ((b.DESCNUMDOC IS NOT NULL OR c.NUMIDENTIFICAUNO IS NOT NULL) AND c.TIPOIDENTIFICAUNO_ID = 13) 	");
 		 sql.append("      THEN  nvl(b.descnumdoc, c.numidentificauno)                                                         	");
@@ -296,14 +296,14 @@ public class RelatorioPassagensAGR extends Relatorio {
 		 sql.append("  ct.desccategoria    AS tipo_desconto_beneficio, 															");
 		 sql.append("  b.nombpasajero AS nome_passageiro,                                                                      	");
 		 sql.append("  CASE                                                                                                    	");
-		 sql.append("      WHEN ((b.DESCNUMDOC IS NOT NULL OR c.NUMIDENTIFICAUNO IS NOT NULL) AND c.TIPOIDENTIFICAUNO_ID = 1)  	");
-		 sql.append("      THEN  nvl(b.descnumdoc, c.numidentificauno)                                                         	");
+		 sql.append("      WHEN (b.desctipodoc like 'RG') THEN b.descnumdoc													  	");
+		 sql.append("      WHEN (b.desctipodoc2 like 'RG') THEN  b.descnumdoc2                                                 	");
 		 sql.append("      ELSE ''                                                                                             	");
 		 sql.append("  END AS numero_identidade,                                                                               	");
 		 sql.append("  ''  AS orgao_expedidor,                                                                                 	");
 		 sql.append("  CASE                                                                                                    	");
-		 sql.append("      WHEN ((b.DESCNUMDOC IS NOT NULL OR c.NUMIDENTIFICAUNO IS NOT NULL) AND c.TIPOIDENTIFICAUNO_ID = 2)  	");
-		 sql.append("      THEN  nvl(b.descnumdoc, c.numidentificauno)                                                         	");
+		 sql.append("      WHEN (b.desctipodoc like 'CPF') THEN b.descnumdoc												  	");
+		 sql.append("      WHEN (b.desctipodoc2 like 'RG') THEN  b.descnumdoc2    	                                        	");
 		 sql.append("      ELSE ''                                                                                             	");
 		 sql.append("  END AS cpf_passageiro,                                                                                  	");
 		 sql.append("  b.numasiento AS numero_poltrona,                                                                        	");
@@ -319,7 +319,7 @@ public class RelatorioPassagensAGR extends Relatorio {
 		 sql.append("FROM	                                                                                                	");
 		 sql.append("	boleto  b 					                                                                           	");
 		 sql.append("		LEFT JOIN BPE                bpe ON (bpe.boleto_id = b.boleto_id AND bpe.activo = 1)            	");
-		 sql.append("		LEFT JOIN empresa            e   ON (e.empresa_id = b.empresacorrida_id)                        	");
+		 sql.append("		LEFT JOIN empresa            e   ON (e.empresa_id = b.marca_id)                        				");
 		 sql.append("		LEFT JOIN parada             ori ON (ori.parada_id = b.origen_id)                               	");
 		 sql.append("		LEFT JOIN parada             des ON (des.parada_id = b.destino_id)                              	");
 		 sql.append("		LEFT JOIN ruta               r   ON (r.ruta_id = b.ruta_id)                                     	");
@@ -328,6 +328,11 @@ public class RelatorioPassagensAGR extends Relatorio {
 		 sql.append("											AND c.activo = 1)                           	               	");
 		 sql.append("		LEFT JOIN categoria 		 ct	 ON (b.categoria_id = ct.categoria_id 								");
 		 sql.append("											AND ct.activo =1 and ct.categoria_id not in (1))				");
+		 sql.append("  		LEFT JOIN punto_venta pv ON (b.puntoventa_id = pv.puntoventa_id and pv.activo =1)					");
+		 sql.append("    	LEFT JOIN parada    pr ON  (pv.parada_id = pr.parada_id and pr.activo =1)							");
+		 sql.append("   	LEFT JOIN ciudad    ci ON  (pr.ciudad_id = ci.ciudad_id and ci.activo =1)							");
+		 sql.append("   	LEFT JOIN inscricao_estadual ie ON (e.empresa_id = ie.empresa_id 									");
+		 sql.append(" 		 										and ci.estado_id = ie.estado_id and ie.activo =1)			");
 		sql.append("WHERE		                                                                                               	");
 		sql.append("     	( b.motivocancelacion_id NOT IN ( 4 ) 							");
 		sql.append("           OR b.motivocancelacion_id IS NULL ) 							");
@@ -346,7 +351,7 @@ public class RelatorioPassagensAGR extends Relatorio {
 		}
 
 		if (!empresa.isEmpty()){
-			sql.append("	AND b.empresacorrida_id =:empresa_id  							");
+			sql.append("	AND e.empresa_id =:empresa_id  							");
 		}
 		
 		if (linha != null && !linha.equals("Todas")) {