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

fixes bug #8826 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@67520 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-03-31 18:52:23 +00:00
parent f18069638c
commit 820838bbe4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -562,7 +562,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
private void carregarTotalFormapago(ResumoComissao resumoComissao, List<BoletoComissao> boletoComissaos, List<EventosFinanceirosVO> lsEventosFinanceiros) { private void carregarTotalFormapago(ResumoComissao resumoComissao, List<BoletoComissao> boletoComissaos, List<EventosFinanceirosVO> lsEventosFinanceiros) {
List<FormapagoVO> totalFormapagos = new ArrayList<FormapagoVO>(); List<FormapagoVO> totalFormapagos = new ArrayList<FormapagoVO>();
for (BoletoComissao boletoComissao : boletoComissaos) { for (BoletoComissao boletoComissao : boletoComissaos) {
if (boletoComissao.isTotalizarFormapago()) { if (boletoComissao.isTotalizarTipovenda() && !boletoComissao.isNaoSomarBilhete()) {
for (FormapagoVO formapagoBoleto : boletoComissao.getFormapagos()) { for (FormapagoVO formapagoBoleto : boletoComissao.getFormapagos()) {
FormapagoVO formapago; FormapagoVO formapago;
if (totalFormapagos.contains(formapagoBoleto)) { if (totalFormapagos.contains(formapagoBoleto)) {
@ -574,8 +574,12 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
if (boletoComissao.isAbaBilheteVendido() || boletoComissao.isAbaGapVendido() || boletoComissao.isAbaBilheteManual()) { if (boletoComissao.isAbaBilheteVendido() || boletoComissao.isAbaGapVendido() || boletoComissao.isAbaBilheteManual()) {
formapago.add(formapagoBoleto.getImporte()); formapago.add(formapagoBoleto.getImporte());
} else if ((boletoComissao.isAbaBilheteCancelado() || boletoComissao.isAbaBilheteDevolvido() || boletoComissao.isAbaGapCancelado() || boletoComissao.isAbaGapDevolvido())) { } else if (boletoComissao.isAbaBilheteCancelado() || boletoComissao.isAbaGapCancelado()) {
formapago.subtract(formapagoBoleto.getImporte()); formapago.subtract(formapagoBoleto.getImporte());
} else if(boletoComissao.isAbaBilheteDevolvido() || boletoComissao.isAbaGapDevolvido()) {
if(boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido()) {
formapago.subtract(formapagoBoleto.getImporte());
}
} }
} }
} }

2
src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
View File

@ -785,7 +785,7 @@ public class BoletoComissao {
return totalizar; return totalizar;
} }
private boolean isTotalizarTipovenda() { public boolean isTotalizarTipovenda() {
return isAbaBilheteManual() || return isAbaBilheteManual() ||
isAbaBilheteVendido() || isAbaBilheteVendido() ||
isAbaBilheteCancelado() || isAbaBilheteCancelado() ||