From 8b9834e94639059790771a4a62f64372d2730e6b Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Mon, 7 Oct 2024 17:18:37 -0300
Subject: [PATCH] fixes bug#AL-4916

---
 pom.xml                                                         | 2 +-
 .../impl/RelatorioPosicaoVendaBilheteIdosoPorPassageiro.java    | 1 +
 .../impl/RelatorioPosicaoVendaBilheteIdosoPorTrecho.java        | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ff649fbac..e7ef939b3 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.152.1</version>
+	<version>1.152.2</version>
 	<packaging>war</packaging> 
     
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPosicaoVendaBilheteIdosoPorPassageiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPosicaoVendaBilheteIdosoPorPassageiro.java
index 20948cb54..48334e222 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPosicaoVendaBilheteIdosoPorPassageiro.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPosicaoVendaBilheteIdosoPorPassageiro.java
@@ -58,6 +58,7 @@ public class RelatorioPosicaoVendaBilheteIdosoPorPassageiro extends Relatorio {
 			if (!RelatorioPosicaoVendaBilheteIdosoController.LISTAR_TODAS.equals(parametros.get("rutaId"))) {
 				instrucaoSql.append("AND C.RUTA_ID IN ("+parametros.get("rutaId").toString()+") ");
 			}
+			instrucaoSql.append(" AND C.MOTIVOCANCELACION_ID IS NULL ");
 			instrucaoSql.append("ORDER BY R.DESCRUTA, CAT.DESCCATEGORIA ");
 		}
 
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPosicaoVendaBilheteIdosoPorTrecho.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPosicaoVendaBilheteIdosoPorTrecho.java
index 5afac81eb..6ff02a242 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPosicaoVendaBilheteIdosoPorTrecho.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPosicaoVendaBilheteIdosoPorTrecho.java
@@ -58,6 +58,7 @@ public class RelatorioPosicaoVendaBilheteIdosoPorTrecho extends Relatorio {
 			if (!RelatorioPosicaoVendaBilheteIdosoController.LISTAR_TODAS.equals(parametros.get("rutaId"))) {
 				instrucaoSql.append("AND C.RUTA_ID IN ("+parametros.get("rutaId").toString()+") ");
 			}
+			instrucaoSql.append(" AND C.MOTIVOCANCELACION_ID IS NULL ");
 			instrucaoSql.append("GROUP BY R.DESCRUTA,  ");
 			instrucaoSql.append("CAT.DESCCATEGORIA, ");
 			instrucaoSql.append("ORIGEM.DESCPARADA, ");