From 093c41164dc6c284aee91fba9c68b63b17b67927 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 6 Aug 2018 12:57:42 +0000
Subject: [PATCH] bug#11765 dev:thiago qua:

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 0e94d1aad..246a06d6e 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -892,13 +892,14 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					sQuery.append("AND ( ")
 						  .append("		(C.PUNTOVENTA_ID = :puntoventaId AND (C.MOTIVOCANCELACION_ID IS NULL OR C.MOTIVOCANCELACION_ID NOT IN (")
 						  .append(sMotivosCancelacion)
-						  .append("))) ")
+						  .append(")) ")
+						  .append(" 	AND (C.PTOVTAVENTA_ID IS NULL OR C.PTOVTAVENTA_ID = :puntoventaId)) ")
 						  .append("		OR ")
 						  .append("		(C.PTOVTAVENTA_ID = :puntoventaId AND C.MOTIVOCANCELACION_ID IN (")
 						  .append(sMotivosCancelacion)
 						  .append(")) ")
 						  .append("		OR ")
-						  .append("		(C.PUNTOVENTA_ID = :puntoventaId AND (C.PTOVTAVENTA_ID IS NULL OR C.PUNTOVENTA_ID = C.PTOVTAVENTA_ID)) ")
+						  .append("		(C.PUNTOVENTA_ID = :puntoventaId AND (C.PTOVTAVENTA_ID IS NULL OR C.PTOVTAVENTA_ID = :puntoventaId)) ")
 						  .append("		OR ")
 						  .append("		(C.PUNTOVENTA_ID = :puntoventaId AND C.INDSTATUSBOLETO = 'E' AND C.MOTIVOCANCELACION_ID IS NULL) ")
 						  .append(" ) ");