fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fixes bug#AL-4152' (!531) from AL-4152 into master 

Reviewed-on: adm/VentaBoletosAdm#531
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
master 1.78.3
wallace 2024-05-22 20:19:40 +00:00
parent 1bd7cc684d 8786704084
commit faf955714e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.78.2</version> <version>1.78.3</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoDevolucao.java
View File

@ -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 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 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("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("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("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 "); sql.append("INNER JOIN PUNTO_VENTA agencia ON agencia.PUNTOVENTA_ID = boleto.PUNTOVENTA_ID ");

2
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioRemarcacaoDevolucaoController.java
View File

@ -95,7 +95,7 @@ public class RelatorioRemarcacaoDevolucaoController extends MyGenericForwardComp
String titulo = rdbTipoRemarcao.isSelected() ? String titulo = rdbTipoRemarcao.isSelected() ?
Labels.getLabel("relatorioRemarcacaoDevolucao.relatorioRemarcacao.title") Labels.getLabel("relatorioRemarcacaoDevolucao.relatorioRemarcacao.title")
: Labels.getLabel("relatorioRemarcacaoDevolucao.relatoriodevolucao.title"); : Labels.getLabel("relatorioRemarcacaoDevolucao.relatorioDevolucao.title");
StringBuilder filtro = new StringBuilder(); StringBuilder filtro = new StringBuilder();