From 74d3b244642e88a19f7e73d405fb5a972548dcc2 Mon Sep 17 00:00:00 2001
From: walace <walace@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 3 Nov 2022 13:37:32 +0000
Subject: [PATCH] fixes bug#AL-1633 dev: qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@115134 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../service/impl/ConferenciaComissaoServiceImpl.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
index 22c636681..ea60c7115 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
@@ -617,14 +617,14 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 					if (boletoComissao.isMotivocancelacionQuitacaoOcd()) {
 						formapago.subtract(formapagoBoleto.getImporte());
 						// somando as vendas
-					} else if (boletoComissao.isAbaBilheteVendido() || boletoComissao.isAbaGapVendido() || boletoComissao.isAbaBilheteManual()) {
+					} else if (boletoComissao.isAbaBilheteVendido() || boletoComissao.isAbaGapVendido() || boletoComissao.isAbaBilheteManual() || (boletoComissao.isVendaBilheteTransferencia(boletoComissao.getTipoVenta()) &&  formapago.getFormapagoId() == 1)) {
 						formapago.add(formapagoBoleto.getImporte());
 						// subtraindo os cancelamentos
 					} else if (boletoComissao.isAbaBilheteCancelado() || boletoComissao.isAbaGapCancelado()) {
 						formapago.subtract(formapagoBoleto.getImporte());
 						// subtraindo as trocas e devolucoes
-					} else if (boletoComissao.isAbaBilheteDevolvido() || boletoComissao.isAbaGapDevolvido()) {
-						if (boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido() || boletoComissao.isMotivocancelacionQuitacaoOcd()) {
+					} else if (boletoComissao.isAbaBilheteDevolvido() || boletoComissao.isAbaGapDevolvido() || boletoComissao.isMotivocancelacionTransferido()) {
+						if (boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido() || boletoComissao.isMotivocancelacionQuitacaoOcd() || (boletoComissao.isVendaBilheteTransferencia(boletoComissao.getTipoVenta()) &&  formapago.getFormapagoId() == 1)) {
 							formapago.subtract(formapagoBoleto.getImporte());
 						}
 					}