From 898f8d1152600c62168b86e6cbe08020ba165c4c Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Wed, 21 Aug 2024 09:20:46 -0300
Subject: [PATCH] fixes bug#AL-4747 Relatorio considerando excluidos/inativos

---
 pom.xml                                                     | 2 +-
 .../relatorios/impl/RelatorioComissaoSintetico.java         | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 64c2f9fb0..b8f8b6599 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.127.1</version>
+	<version>1.127.2</version>
 	<packaging>war</packaging> 
     
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java
index 92d8b7382..b422ec083 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java
@@ -139,11 +139,12 @@ public class RelatorioComissaoSintetico extends Relatorio  {
 		sql.append("   LEFT JOIN (SELECT importe, puntoventa_id, empresa_id, fechoroperacion FROM conta_corrente_ptovta  		");
 		sql.append("                WHERE feccorte BETWEEN :DATA_INICIAL AND :DATA_FINAL 						");
 		if (!agencia.isEmpty()) {
-		sql.append("                   AND puntoventa_id in  ("+agencia+")										");
+			sql.append("                   AND puntoventa_id in  ("+agencia+")									");
 		}
 		if (!empresa.isEmpty()) {
-		sql.append("                   AND empresa_id = :EMPRESA_ID												");
+			sql.append("                   AND empresa_id = :EMPRESA_ID											");
 		}
+		sql.append("                   AND activo = 1       												    ");
 		sql.append("                   AND tipooperacioncc_id = 5) cc on (cc.empresa_id = cm.empresa_id 		");
 		sql.append(" 												and cc.puntoventa_id = pv.puntoventa_id		");
 		sql.append(" 												and cc.fechoroperacion = cm.datamovimento	");
@@ -156,6 +157,7 @@ public class RelatorioComissaoSintetico extends Relatorio  {
 		if (!empresa.isEmpty()) {
 			sql.append("    AND cm.empresa_id = :EMPRESA_ID														");
 		}
+		sql.append("    AND cm.activo = 1                														");
 		sql.append(" ORDER  BY pv.nombpuntoventa,  cm.datamovimento 											");
 		
 		return sql.toString();