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

Merge pull request 'fixes bug#AL-4916' (!760) from AL-4916 into master 

Reviewed-on: adm/VentaBoletosAdm#760
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master 1.152.2
Gleison da Cruz 2024-10-07 20:20:53 +00:00
parent ace509bcd3 8b9834e946
commit 20777489a7
3 changed files with 3 additions and 1 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>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.152.1</version>
<version>1.152.2</version>
<packaging>war</packaging>
<properties>

1
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPosicaoVendaBilheteIdosoPorPassageiro.java
View File

@ -58,6 +58,7 @@ public class RelatorioPosicaoVendaBilheteIdosoPorPassageiro extends Relatorio {
if (!RelatorioPosicaoVendaBilheteIdosoController.LISTAR_TODAS.equals(parametros.get("rutaId"))) {
instrucaoSql.append("AND C.RUTA_ID IN ("+parametros.get("rutaId").toString()+") ");
}
instrucaoSql.append(" AND C.MOTIVOCANCELACION_ID IS NULL ");
instrucaoSql.append("ORDER BY R.DESCRUTA, CAT.DESCCATEGORIA ");
}

1
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPosicaoVendaBilheteIdosoPorTrecho.java
View File

@ -58,6 +58,7 @@ public class RelatorioPosicaoVendaBilheteIdosoPorTrecho extends Relatorio {
if (!RelatorioPosicaoVendaBilheteIdosoController.LISTAR_TODAS.equals(parametros.get("rutaId"))) {
instrucaoSql.append("AND C.RUTA_ID IN ("+parametros.get("rutaId").toString()+") ");
}
instrucaoSql.append(" AND C.MOTIVOCANCELACION_ID IS NULL ");
instrucaoSql.append("GROUP BY R.DESCRUTA, ");
instrucaoSql.append("CAT.DESCCATEGORIA, ");
instrucaoSql.append("ORIGEM.DESCPARADA, ");