From cb47673ac107ee68b1864c74e1b5fd4d56143ef4 Mon Sep 17 00:00:00 2001
From: Fabio Faria <fabio.fbarreto@totvs.com.br>
Date: Tue, 13 Jun 2023 14:05:38 -0300
Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20de=20produto=20cartesiano?=
 =?UTF-8?q?=20no=20relatorio=20de=20deposito=20fix=20bug#AL-2743?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index aa2162528..dcf34303a 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.7.10</version>
+	<version>1.7.11</version>
 	<packaging>war</packaging>
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java
index 95a0312b6..fabb9703a 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java
@@ -141,7 +141,6 @@ public class RelatorioDepositos extends Relatorio {
 
 	@Override
 	protected void processaParametros() throws Exception {
-		// TODO document why this method is empty
 	}
 
 	private String getSQL(Integer puntoVentaId, Integer empresaId, boolean filtrarPendentes) {
@@ -192,7 +191,10 @@ public class RelatorioDepositos extends Relatorio {
 		sql.append("   LEFT JOIN FECHAMENTO_DEPOSITO fdp ");
 		sql.append("      ON fdp.FECHAMENTODEPOSITO_ID = fd.FECHAMENTODEPOSITO_ID ");
 		sql.append("      AND fdp.activo = 1 ");
-		sql.append(" INNER JOIN fechamento_paramptovta fptovta on (fptovta.PUNTOVENTA_ID = F.puntoventa_id and fptovta.empresa_id = F.empresa_id)  ");
+		sql.append(" INNER JOIN fechamento_paramptovta fptovta ");
+		sql.append("      ON fptovta.PUNTOVENTA_ID = F.puntoventa_id ");
+		sql.append("      AND fptovta.empresa_id = F.empresa_id ");
+		sql.append("      AND fptovta.activo = 1 ");
 		sql.append("   WHERE f.fecfechamento BETWEEN :fecInicio AND :fecFinal ");
 		sql.append("     AND f.activo = 1 ");
 		sql.append(" AND  fptovta.TIPOPAGAMENTO = 'D' ");