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

Merge pull request 'fixes bug#AL-4887' (!697) from AL-4887 into master 

Reviewed-on: adm/VentaBoletosAdm#697
Reviewed-by: wallace <wallace@rjconsultores.com.br>
master 1.132.2
wallace 2024-09-03 20:33:48 +00:00
parent b9123c88ee 7c653c6183
commit 08bdea3c60
2 changed files with 2 additions and 2 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.132.1</version> <version>1.132.2</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

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

@ -170,7 +170,7 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio {
sql.append("INNER JOIN CIUDAD co ON co.ciudad_id=po.ciudad_id "); sql.append("INNER JOIN CIUDAD co ON co.ciudad_id=po.ciudad_id ");
sql.append("INNER JOIN CIUDAD cd ON cd.ciudad_id=pd.ciudad_id "); sql.append("INNER JOIN CIUDAD cd ON cd.ciudad_id=pd.ciudad_id ");
sql.append("WHERE b.fechorventa BETWEEN :DATA_INICIAL AND :DATA_FINAL "); sql.append("WHERE b.fechorventa BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
sql.append("AND sx.ACTIVO = 1 "); sql.append("AND sx.indcancelado = 1 ");
if(empresaID != null) if(empresaID != null)
sql.append("AND em.empresa_id = :EMPRESA_ID "); sql.append("AND em.empresa_id = :EMPRESA_ID ");
if(origemID != null) if(origemID != null)