From 1cc1c0664435b2c393a01a2ddeee1030dd12782a Mon Sep 17 00:00:00 2001
From: "bruno.neves" <bruno.neves@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 20 Nov 2017 12:06:05 +0000
Subject: [PATCH] fixes bug 0010024 - commit Trunk

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index bb9a58c09..863e08c1b 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -910,8 +910,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			List<BoletoComissao> lsBoletoComissao = new ArrayList<BoletoComissao>();
 			List<BoletoComissao> auxLsBoletoComissao = qr.list();
 			for (BoletoComissao boletoComissao : auxLsBoletoComissao) {
-				if(boletoComissao.getIndstatusboleto().equals("E") && boletoComissao.getLogconferenciaId()== null) {
-										boletoComissao.setConferido(isConferidoVenta(boletoComissao));
+				if(!boletoComissao.isBilheteEntregaConferidoVenda()) {
+					boletoComissao.setConferido(isConferidoVenta(boletoComissao));
 				}	
 				if (boletoComissao.getFormapagos() == null) {
 					boletoComissao.setFormapagos(new ArrayList<FormapagoVO>());
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
index 1e46a32f4..1d55b0da6 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
@@ -1,4 +1,4 @@
-	package com.rjconsultores.ventaboletos.vo.comissao;
+package com.rjconsultores.ventaboletos.vo.comissao;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -708,6 +708,10 @@ public class BoletoComissao {
 	public void setNombpasajero(String nombpasajero) {
 		this.nombpasajero = nombpasajero;
 	}
+	
+	public boolean isBilheteEntregaConferidoVenda() {
+		return isStatusEntregue() && this.getLogconferenciaId() != null;
+	}
 
 	public IndStatusBoleto getIndstatusboletoEnum() {
 		return IndStatusBoleto.getIndStatusBoleto(getIndstatusboleto());