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

fixes bug#AL-4747 

Relatorio considerando excluidos/inativos
master
Gleison da Cruz 2024-08-21 09:20:46 -03:00
parent bad152baa5
commit 898f8d1152
2 changed files with 5 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.127.1</version> <version>1.127.2</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java
View File

@ -139,11 +139,12 @@ public class RelatorioComissaoSintetico extends Relatorio {
sql.append(" LEFT JOIN (SELECT importe, puntoventa_id, empresa_id, fechoroperacion FROM conta_corrente_ptovta "); sql.append(" LEFT JOIN (SELECT importe, puntoventa_id, empresa_id, fechoroperacion FROM conta_corrente_ptovta ");
sql.append(" WHERE feccorte BETWEEN :DATA_INICIAL AND :DATA_FINAL "); sql.append(" WHERE feccorte BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
if (!agencia.isEmpty()) { if (!agencia.isEmpty()) {
sql.append(" AND puntoventa_id in ("+agencia+") "); sql.append(" AND puntoventa_id in ("+agencia+") ");
} }
if (!empresa.isEmpty()) { if (!empresa.isEmpty()) {
sql.append(" AND empresa_id = :EMPRESA_ID "); sql.append(" AND empresa_id = :EMPRESA_ID ");
} }
sql.append(" AND activo = 1 ");
sql.append(" AND tipooperacioncc_id = 5) cc on (cc.empresa_id = cm.empresa_id "); sql.append(" AND tipooperacioncc_id = 5) cc on (cc.empresa_id = cm.empresa_id ");
sql.append(" and cc.puntoventa_id = pv.puntoventa_id "); sql.append(" and cc.puntoventa_id = pv.puntoventa_id ");
sql.append(" and cc.fechoroperacion = cm.datamovimento "); sql.append(" and cc.fechoroperacion = cm.datamovimento ");
@ -156,6 +157,7 @@ public class RelatorioComissaoSintetico extends Relatorio {
if (!empresa.isEmpty()) { if (!empresa.isEmpty()) {
sql.append(" AND cm.empresa_id = :EMPRESA_ID "); sql.append(" AND cm.empresa_id = :EMPRESA_ID ");
} }
sql.append(" AND cm.activo = 1 ");
sql.append(" ORDER BY pv.nombpuntoventa, cm.datamovimento "); sql.append(" ORDER BY pv.nombpuntoventa, cm.datamovimento ");
return sql.toString(); return sql.toString();