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); + } } }