From cb923a8081f72a29c82c50b05e45bab1a8972cf7 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 5 Sep 2016 18:11:00 +0000
Subject: [PATCH] fixes bug #7804

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@60010 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/ConferenciaComissaoHibernateDAO.java     | 7 ++++---
 .../service/impl/ConferenciaComissaoServiceImpl.java       | 1 +
 .../ventaboletos/vo/comissao/BoletoComissao.java           | 6 ++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index f3b068d6f..bde07e5b0 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -751,9 +751,10 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				if (boletoComissao.getFormapagos() == null) {
 					boletoComissao.setFormapagos(new HashSet<FormapagoVO>());
 				}
-
+				
 				if (lsBoletoComissao.contains(boletoComissao)) {
-					BoletoComissao aux = lsBoletoComissao.get(lsBoletoComissao.indexOf(boletoComissao));
+					int indice = lsBoletoComissao.indexOf(boletoComissao);
+					BoletoComissao aux = lsBoletoComissao.get(indice);
 					aux.setComempcategoriaId(boletoComissao.getComempcategoriaId() != null
 							? boletoComissao.getComempcategoriaId() : aux.getComempcategoriaId());
 					aux.setComempformapagoId(boletoComissao.getComempformapagoId() != null
@@ -762,7 +763,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 							boletoComissao.getDescpago(),
 							boletoComissao.getIndconferenciafisicacomissao(),
 							boletoComissao.getImporteFp()));
-					lsBoletoComissao.set(lsBoletoComissao.indexOf(boletoComissao), aux);
+					lsBoletoComissao.set(indice, aux);
 				}
 				else {
 					boletoComissao.getFormapagos().add(new FormapagoVO(boletoComissao.getFormapagoId(),
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
index 1b1f54d67..f71460be1 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
@@ -252,6 +252,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 			   boletoComissao.isBilheteNormalTrocadoDevolvido() ||
 			   boletoComissao.isBilheteTrocadoDevolvido() ||
 			   boletoComissao.isBilheteNormalTransferidoDevolvido() ||
+			   boletoComissao.isBilheteNormalTransferidoTrocado() ||
 			   boletoComissao.isBilheteAbertoDevolvido() ||
 			   boletoComissao.isBilheteAbertoDevolvidoTrocado() ||
 			   boletoComissao.isBilheteEntregaGapDevolvido() ||
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
index 5e000b37e..707f499f1 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
@@ -704,6 +704,11 @@ public class BoletoComissao {
 	public boolean isBilheteNormalTransferidoDevolvido() {
 		return isVendaBilheteTransferencia(getTipoVenta()) && isStatusCancelado() && isMotivocancelacionDevolvido();
 	}
+	
+	/** ABA BILHETE DEVOLVIDO */
+	public boolean isBilheteNormalTransferidoTrocado() {
+		return isVendaBilheteTransferencia(getTipoVenta()) && isStatusCancelado() && isMotivocancelacionTrocado();
+	}
 
 	/** ABA BILHETE CANCELADO */
 	public boolean isBilheteNormalTrocadoCancelado() {
@@ -910,4 +915,5 @@ public class BoletoComissao {
 				|| isBilheteGapTrocadoCancelado()
 				|| isBilheteGapTrocadoDevolvido();
 	}
+
 }