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

Merge pull request 'bug#AL-1944' (#29) from AL-1944 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/29
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
master 1.0.23
fabio 2022-12-28 18:05:50 +00:00
parent 3b5d6aeb9e 8b16b4ce36
commit eda134453b
3 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.0.22</version>
<version>1.0.23</version>
<packaging>war</packaging>
<distributionManagement>
@ -31,7 +31,7 @@
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>ISO-8859-1</encoding>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
@ -55,13 +55,13 @@
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId>
<version>1.0.16</version>
<version>1.0.17</version>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>Flyway</artifactId>
<version>1.0.7</version>
<version>1.0.8</version>
</dependency>
<dependency>

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

@ -179,12 +179,8 @@ public class RelatorioBoletos extends Relatorio {
sql.append(" INNER JOIN empresa e ");
sql.append(" ON e.empresa_id = fcc.empresa_id ");
sql.append(" AND e.activo = 1 ");
sql.append(" INNER JOIN fechamento_paramptovta fppv ");
sql.append(" ON p.puntoventa_id = fppv.puntoventa_id ");
sql.append(" AND e.empresa_id = fppv.empresa_id ");
sql.append(" AND tipopagamento = 'B' ");
sql.append(" AND fppv.activo = 1 ");
sql.append(" WHERE fb.activo = 1 ");
sql.append(" WHERE fb.activo = 1 ");
sql.append(" AND fb.tipo_pagamento = 'B' ");
if(fecInicio != null && fecFinal != null) {
sql.append(" AND fcc.fecfechamento BETWEEN :fecInicio AND :fecFinal ");

14
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java
View File

@ -180,22 +180,16 @@ public class RelatorioDepositos extends Relatorio {
sql.append(" ON p.puntoventa_id = f.puntoventa_id ");
sql.append(" INNER JOIN empresa e ");
sql.append(" ON e.empresa_id = f.empresa_id ");
sql.append(" INNER JOIN fechamento_paramptovta fppv ");
sql.append(" ON p.puntoventa_id = fppv.puntoventa_id ");
sql.append(" AND e.empresa_id = fppv.empresa_id ");
sql.append(" AND tipopagamento = 'D' ");
sql.append(" AND fppv.activo = 1 ");
sql.append(" INNER JOIN fechamento_boleto fbol ");
sql.append(" ON f.fechamentocntcorrente_id = fbol.fechamentocntcorrente_id ");
sql.append(" AND fbol.tipo_pagamento = 'D' ");
sql.append(" AND fbol.activo = 1 ");
sql.append(" LEFT JOIN fechamento_cct_deposito fd ");
sql.append(" ON fd.fechamentocntcorrente_id = f.fechamentocntcorrente_id ");
sql.append(" AND fd.activo = 1 ");
sql.append(" LEFT JOIN FECHAMENTO_DEPOSITO fdp ");
sql.append(" ON fdp.FECHAMENTODEPOSITO_ID = fd.FECHAMENTODEPOSITO_ID ");
sql.append(" AND fdp.activo = 1 ");
sql.append(" LEFT JOIN empresa_contabancaria ecb ");
sql.append(" ON ecb.EMPRESACONTABANCARIA_ID = fdp.EMPRESACONTABANCARIA_ID ");
sql.append(" AND ecb.activo = 1 ");
sql.append(" LEFT JOIN fechamento_boleto fbol ON f.fechamentocntcorrente_id = fbol.fechamentocntcorrente_id and fbol.indboletoquitado=1 ");
sql.append(" WHERE f.fecfechamento BETWEEN ? AND ? ");
sql.append(" AND f.activo = 1 ");
sql.append(" AND e.activo = 1 ");