From 8786704084427e8ca78fbba5d0e1aab01ffa78c6 Mon Sep 17 00:00:00 2001
From: "wallace.henrique" <wallace.henrique@BHN330100022.bh01.local>
Date: Wed, 22 May 2024 17:18:03 -0300
Subject: [PATCH] fixes bug#AL-4152

dev:
qua:
---
 pom.xml                                                         | 2 +-
 .../relatorios/impl/RelatorioRemarcacaoDevolucao.java           | 2 +-
 .../relatorios/RelatorioRemarcacaoDevolucaoController.java      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8625d921c..25718aa99 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.78.2</version> 
+	<version>1.78.3</version> 
 	 <packaging>war</packaging> 
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoDevolucao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoDevolucao.java
index caec00916..e3da86547 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoDevolucao.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoDevolucao.java
@@ -97,7 +97,7 @@ public class RelatorioRemarcacaoDevolucao extends Relatorio {
 		sql.append("INNER JOIN PARADA          destino ON destino.PARADA_ID       = boleto.DESTINO_ID ");
 		sql.append("INNER JOIN RUTA              linha ON linha.RUTA_ID           = boleto.RUTA_ID ");
 		sql.append("INNER JOIN CORRIDA         servico ON (servico.CORRIDA_ID     = boleto.CORRIDA_ID AND servico.FECCORRIDA = boleto.FECCORRIDA) ");
-		sql.append("LEFT JOIN EVENTO_EXTRA eventoExtra ON eventoExtra.BOLETO_ID   = boleto.BOLETO_ID ");
+		sql.append("LEFT JOIN EVENTO_EXTRA eventoExtra ON eventoExtra.BOLETO_ID   = boletoOriginal.BOLETO_ID ");
 		sql.append("INNER JOIN MARCA marca             ON marca.MARCA_ID 	        = boleto.MARCA_ID ");
 		sql.append("LEFT JOIN CLIENTE cliente         ON cliente.CLIENTE_ID       = boleto.CLIENTE_ID ");
 		sql.append("INNER JOIN PUNTO_VENTA       agencia ON agencia.PUNTOVENTA_ID = boleto.PUNTOVENTA_ID ");
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioRemarcacaoDevolucaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioRemarcacaoDevolucaoController.java
index d3262f6b0..bdeea0cdd 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioRemarcacaoDevolucaoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioRemarcacaoDevolucaoController.java
@@ -95,7 +95,7 @@ public class RelatorioRemarcacaoDevolucaoController extends MyGenericForwardComp
 
 				String titulo = rdbTipoRemarcao.isSelected() ?
 						Labels.getLabel("relatorioRemarcacaoDevolucao.relatorioRemarcacao.title")
-						: Labels.getLabel("relatorioRemarcacaoDevolucao.relatoriodevolucao.title");
+						: Labels.getLabel("relatorioRemarcacaoDevolucao.relatorioDevolucao.title");
 
 				StringBuilder filtro = new StringBuilder();