From d2999eea7dbda96608ce0d2223da3cdfa2346490 Mon Sep 17 00:00:00 2001
From: "celio.souza" <celio.souza@BHN330100030.bh01.local>
Date: Tue, 20 Feb 2024 19:17:12 -0300
Subject: [PATCH] fixes bug #AL-3739

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

diff --git a/pom.xml b/pom.xml
index 255129571..e4c0e67fe 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.52.1</version> 
+	<version>1.52.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 32cb30b5e..92d8b7382 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java
@@ -136,7 +136,7 @@ public class RelatorioComissaoSintetico extends Relatorio  {
 		sql.append(" FROM ");
 		sql.append("   comissao    cm																			");
 		sql.append("   LEFT JOIN punto_venta pv ON ( cm.puntoventa_id = pv.puntoventa_id AND pv.activo = 1 )	");
-		sql.append("   LEFT JOIN (SELECT importe, puntoventa_id, empresa_id FROM conta_corrente_ptovta  		");
+		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+")										");
@@ -145,8 +145,9 @@ public class RelatorioComissaoSintetico extends Relatorio  {
 		sql.append("                   AND empresa_id = :EMPRESA_ID												");
 		}
 		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 importe is not null)       			");
+		sql.append(" 												and cc.puntoventa_id = pv.puntoventa_id		");
+		sql.append(" 												and cc.fechoroperacion = cm.datamovimento	");
+		sql.append(" 												and importe is not null)       				");
 		sql.append(" WHERE ");
 		sql.append("  	cm.datamovimento  BETWEEN :DATA_INICIAL AND :DATA_FINAL 								");
 		if (!agencia.isEmpty()) {