From 79fdc2750b6f15edd6dda6fdaba153b3b04efc09 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 8 Jun 2018 19:23:10 +0000
Subject: [PATCH] fixes bug#11303 dev:thiago qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@82505 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../rjconsultores/ventaboletos/entidad/AliasServico.java   | 5 +++++
 .../service/impl/CalculoComissaoServiceImpl.java           | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/entidad/AliasServico.java b/src/com/rjconsultores/ventaboletos/entidad/AliasServico.java
index c3c7c7469..ac077fa67 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/AliasServico.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/AliasServico.java
@@ -53,6 +53,11 @@ public class AliasServico implements Serializable {
 	private Integer usuarioId;
 	@Column(name = "INDIDALIASORIGINAL")
 	private Boolean indIdAliasOriginal;
+	
+	public AliasServico() {
+		super();
+		this.indIdAliasOriginal = false;
+	}
 
 	public Integer getAliasServicoId() {
 		return aliasServicoId;
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
index ceffc3b08..4e5b0302d 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
@@ -3,7 +3,6 @@ package com.rjconsultores.ventaboletos.service.impl;
 import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
@@ -310,7 +309,7 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
 	public RegistroCalculo realizarCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo, Boolean isRetencaoDiaria, Integer usuarioId, Boolean isRefazerCalculo) throws ComissaoException, BusinessException {
 
 		PtovtaComissao ptovtaComissao = ptovtaComissaoService.buscarPuntaVentaEmpresa(puntoVentaId, empresaId);
-		if (ptovtaComissao != null) {
+		if (ptovtaComissao != null && (ptovtaComissao.getIndretercomissao() == null || !ptovtaComissao.getIndretercomissao())) {
 
 			//Abate no valor da comissão bpr as saídas de caixa
 			boolean consideraBilhetesDevolvidosEmOutraAgencia = (ptovtaComissao.getIndbilhetesdevcanorigem() == null)?false:ptovtaComissao.getIndbilhetesdevcanorigem();
@@ -357,7 +356,9 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
 				return calcularRegistroCalculo(ptovtaComissao, puntoVentaId, empresaId, periodo, receitas);
 			}
 		} else {
-			if(!isRefazerCalculo) {
+			if(ptovtaComissao != null && ptovtaComissao.getIndretercomissao() != null && ptovtaComissao.getIndretercomissao()) {
+				throw new ComissaoException("busquedaCalculoComissaoController.PtovtaComissaoReterComissao.exception", null, ptovtaComissao.getDescComissaoId() != null ? ptovtaComissao.getPuntoventaId().getNombpuntoventa() : "");
+			} else if(!isRefazerCalculo) {
 				throw new ComissaoException("busquedaCalculoComissaoController.PtovtaComissao.exception");
 			}
 		}