From e50f805b9de7d4f872eb4e5a7a0e06d051eacd9f Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 26 Oct 2015 17:02:27 +0000
Subject: [PATCH] bug #6688

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@49442 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/ConferenciaComissaoHibernateDAO.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 16f143694..c1d753f30 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -549,7 +549,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				  .append("LEFT JOIN CIUDAD CID ON CID.CIUDAD_ID = ORI.PARADA_ID ")
 				  .append("LEFT JOIN ESTADO EST ON EST.ESTADO_ID = CID.ESTADO_ID ")
 				  .append("LEFT JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = B.CATEGORIA_ID ")
-				  .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.BOLETO_ID = B.BOLETO_ID ")
+				  .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.BOLETO_ID = B.BOLETO_ID AND LOG.ACTIVO = 1 ")
 				  .append("INNER JOIN BOLETO_FORMAPAGO BF ON BF.BOLETO_ID = B.BOLETO_ID ")
 				  .append("INNER JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = BF.FORMAPAGO_ID ")
 				  .append("WHERE B.ACTIVO = 1 ")
@@ -787,11 +787,11 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			StringBuilder sQuery = new StringBuilder();
 			sQuery.append("SELECT B.BOLETO_ID AS \"boletoId\" ")
 				  .append("FROM BOLETO B ")
-				  .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.BOLETO_ID = B.BOLETO_ID ")
+				  .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.BOLETO_ID = B.BOLETO_ID AND LOG.ACTIVO = 1 ")
 				  .append("INNER JOIN BOLETO_FORMAPAGO BF ON BF.BOLETO_ID = B.BOLETO_ID ")
 				  .append("INNER JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = BF.FORMAPAGO_ID ")
 				  .append("WHERE B.ACTIVO = 1 ")
-				  .append("AND (LOG.LOGCONFERENCIA_ID IS NULL OR LOG.ACTIVO = 0) ")
+				  .append("AND LOG.LOGCONFERENCIA_ID IS NULL ")
 				  .append("AND FP.INDCONFERENCIAFISICACOMISSAO = 1 ")
 				  .append("AND TO_DATE(B.FECHORVENTA,'DD/MM/YY') = :datamovimento ")
 				  .append("AND B.TIPOVENTA_ID IN (:tipoVenta) ")
@@ -836,10 +836,10 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			sQuery.append("SELECT DISTINCT EE.EVENTOEXTRA_ID AS \"eventoextraId\" ")
 				  .append("FROM EVENTO_EXTRA EE ")
 				  .append("JOIN TIPO_EVENTO_EXTRA TEE ON EE.TIPOEVENTOEXTRA_ID = TEE.TIPOEVENTOEXTRA_ID ")
-				  .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.EVENTOEXTRA_ID = EE.EVENTOEXTRA_ID ")
+				  .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.EVENTOEXTRA_ID = EE.EVENTOEXTRA_ID AND LOG.ACTIVO = 1 ")
 				  .append("LEFT JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = EE.FORMAPAGO_ID ")
 				  .append("WHERE EE.ACTIVO = 1 ")
-				  .append("AND (LOG.LOGCONFERENCIA_ID IS NULL OR LOG.ACTIVO = 0) ")
+				  .append("AND LOG.LOGCONFERENCIA_ID IS NULL ")
 				  .append("AND FP.INDCONFERENCIAFISICACOMISSAO = 1 ")
 				  .append("AND TO_DATE(EE.FECHORINGRESO,'DD/MM/YY') = :datamovimento ");