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

Merge pull request 'fixes bug#AL-4195' (!521) from AL-4195 into master 

Reviewed-on: adm/VentaBoletosAdm#521
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>
master 1.76.2
Célio de Souza Ribeiro JR 2024-05-16 21:32:44 +00:00
parent f5f2265560 c82b4c85e5
commit 2b5e239805
2 changed files with 4 additions and 5 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>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.76.1</version>
<version>1.76.2</version>
<packaging>war</packaging>
<properties>

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

@ -78,16 +78,15 @@ public class RelatorioDepositos extends Relatorio {
deposito.setNumpuntoventa(rs.getString("numpuntoventa"));
deposito.setDtmotivo(rs.getDate("dtmotivo"));
deposito.setVrfechamento(rs.getBigDecimal("vrfechamento"));
deposito.setSaldo(rs.getBigDecimal("saldo").multiply(BigDecimal.valueOf(-1)));
deposito.setEmpresaId(rs.getInt(EMPRESA_ID));
deposito.setPuntoventaId(rs.getInt(PUNTOVENTA_ID));
isBoletoQuitado = "1".equals(rs.getString("indboletoquitado")) ? true : false;
if (isBoletoQuitado) {
deposito.setSaldo(rs.getBigDecimal("saldo").multiply(BigDecimal.valueOf(-1)));
deposito.setVrdeposito(rs.getBigDecimal("vlrBoletoDeposito"));
} else {
deposito.setSaldo(rs.getBigDecimal("saldo").multiply(BigDecimal.valueOf(-1)));
deposito.setVrdeposito(rs.getBigDecimal("valordocumento"));
} else {
deposito.setVrdeposito(rs.getBigDecimal("vlrBoletoDeposito"));
}
if (! filtrarPendentes){