diff --git a/pom.xml b/pom.xml
index a7b737adf..76f83a6e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
br.com.rjconsultores
ventaboletosadm
- 1.6.8
+ 1.6.9
war
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
index 565d88ec9..350535a07 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
@@ -298,13 +298,17 @@ public class RelatorioPassagensAGR extends Relatorio {
sql.append(" CASE ");
sql.append(" WHEN (b.desctipodoc like 'RG') THEN b.descnumdoc ");
sql.append(" WHEN (b.desctipodoc2 like 'RG') THEN b.descnumdoc2 ");
+ sql.append(" WHEN (c.NUMIDENTIFICAUNO IS NOT NULL AND c.TIPOIDENTIFICAUNO_ID = 1) THEN c.numidentificauno ");
+ sql.append(" WHEN (c.NUMIDENTIFICADOS IS NOT NULL AND c.TIPOIDENTIFICADOS_ID = 1) THEN c.numidentificados ");
sql.append(" ELSE '' ");
sql.append(" END AS numero_identidade, ");
sql.append(" '' AS orgao_expedidor, ");
sql.append(" CASE ");
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(" WHEN (b.desctipodoc2 like 'CPF') THEN b.descnumdoc2 ");
+ sql.append(" WHEN (c.NUMIDENTIFICAUNO IS NOT NULL AND c.TIPOIDENTIFICAUNO_ID = 2) THEN c.numidentificauno ");
+ sql.append(" WHEN (c.NUMIDENTIFICADOS IS NOT NULL AND c.TIPOIDENTIFICADOS_ID = 2) THEN c.numidentificados ");
+ sql.append(" ELSE '' ");
sql.append(" END AS cpf_passageiro, ");
sql.append(" b.numasiento AS numero_poltrona, ");
sql.append(" nvl(b.fechorviaje, '') AS data_viagem, ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jasper
index 891971fa3..cc4207b60 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jrxml
index 6c5fd23ad..147e1010e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jrxml
@@ -1,8 +1,8 @@
-
+
-
+
@@ -409,7 +409,7 @@
-
+
@@ -425,7 +425,7 @@
-
+
@@ -441,15 +441,7 @@
-
-
-
-
-
-
-
-
-
+
@@ -521,6 +513,14 @@
+
+
+
+
+
+
+
+