From fbb9d48146be80752ba3835e8dd3509357291b2b Mon Sep 17 00:00:00 2001
From: gleimar <gleimar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 13 Sep 2017 19:45:36 +0000
Subject: [PATCH] =?UTF-8?q?corre=C3=A7=C3=A3o=20da=20considera=C3=A7=C3=A3?=
 =?UTF-8?q?o=20de=20agencia=20diferente=20da=20de=20venda=20no=20cancelame?=
 =?UTF-8?q?nto=20/=20devolu=C3=A7=C3=A3o=20fixes=20bug#9784?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
index 8f2cae116..cb3fce605 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
@@ -613,8 +613,12 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
 					}
 					
 					//Abate no valor da comissão bpr as saídas de caixa
-					BigDecimal bpr = calculoComisssaoBPR(isAltaTemporada, ptovtaComissao, receitaDevItem, BigDecimal.ZERO);
-					comissaoBPR = MoneyHelper.subtrair(comissaoBPR, bpr);
+					boolean consideraBilhetesDevolvidosEmOutraAgencia = (ptovtaComissao.getIndbilhetesdevcanorigem() == null)?false:ptovtaComissao.getIndbilhetesdevcanorigem();
+					
+					if (rcc.isPtoVtaOrigem() && consideraBilhetesDevolvidosEmOutraAgencia) {
+						BigDecimal bpr = calculoComisssaoBPR(isAltaTemporada, ptovtaComissao, receitaDevItem, BigDecimal.ZERO);
+						comissaoBPR = MoneyHelper.subtrair(comissaoBPR, bpr);
+					}
 				}
 			}