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

Merge pull request 'fixes bug#AL-4747' (!667) from AL-4747 into master 

Reviewed-on: adm/VentaBoletosAdm#667
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
master 1.127.2
Gleison da Cruz 2024-08-21 12:25:34 +00:00
parent bad152baa5 898f8d1152
commit 96156233c7
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>

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

@ -144,6 +144,7 @@ public class RelatorioComissaoSintetico extends Relatorio {
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();