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

Merge pull request 'fixes bug#AL-2869' (!207) from AL-2869 into master 

Reviewed-on: adm/VentaBoletosAdm#207
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master 1.8.5
Gleison da Cruz 2023-06-29 20:44:31 +00:00
parent 11afcca88c b3a85e141f
commit 4506da2c2f
2 changed files with 21 additions and 18 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.8.4</version> <version>1.8.5</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBoletos.java
View File

@ -141,7 +141,10 @@ public class RelatorioBoletos extends Relatorio {
sql.append(" INNER JOIN empresa e "); sql.append(" INNER JOIN empresa e ");
sql.append(" ON e.empresa_id = fcc.empresa_id "); sql.append(" ON e.empresa_id = fcc.empresa_id ");
sql.append(" AND e.activo = 1 "); sql.append(" AND e.activo = 1 ");
sql.append(" INNER JOIN fechamento_paramptovta fptovta on (fptovta.PUNTOVENTA_ID = fcc.puntoventa_id and fptovta.empresa_id = fcc.empresa_id) "); sql.append(" INNER JOIN fechamento_paramptovta fptovta ");
sql.append(" ON fptovta.PUNTOVENTA_ID = fcc.puntoventa_id ");
sql.append(" AND fptovta.empresa_id = fcc.empresa_id ");
sql.append(" AND fptovta.activo = 1 ");
sql.append(" WHERE fb.activo = 1 "); sql.append(" WHERE fb.activo = 1 ");
sql.append(" AND fptovta.TIPOPAGAMENTO = 'B' "); sql.append(" AND fptovta.TIPOPAGAMENTO = 'B' ");