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

Merge pull request 'fixes bug#AL-2801' (!68) from AL-2801 into master 

Reviewed-on: adm/ModelWeb#68
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
pinheiro 2023-06-27 14:17:11 +00:00
parent afe6201712 e56bb90e0e
commit 6d7620e1bc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId> <artifactId>ModelWeb</artifactId>
<version>1.6.0</version> <version>1.6.1</version>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>rj-releases</id> <id>rj-releases</id>

2
src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
View File

@ -566,7 +566,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
// subtraindo as trocas e devolucoes // subtraindo as trocas e devolucoes
} else if (boletoComissao.isAbaBilheteDevolvido() || boletoComissao.isAbaGapDevolvido()) { } else if (boletoComissao.isAbaBilheteDevolvido() || boletoComissao.isAbaGapDevolvido()) {
if (boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido()) { if (boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido()) {
totalDeposito = MoneyHelper.subtrair(totalDeposito, formapago.getImporte()); totalDeposito = MoneyHelper.subtrair(totalDeposito, formapago.getImporte().abs());
} }
} }
} }