From d47697a6251210508d4e3e3c644da4631d92802c Mon Sep 17 00:00:00 2001
From: frederico <frederico@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 8 Sep 2017 20:47:09 +0000
Subject: [PATCH] fixed bug #9348

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index ecec11184..37d20ee97 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -267,7 +267,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("FROM CAJA C ")
 					.append("INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ")
 					.append("INNER JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ")
-					.append("WHERE PV.ACTIVO = 1 ")
+					.append("WHERE PV.ACTIVO = 1  AND C.INDREIMPRESION = 0 ")
 					.append("AND C.FECHORVENTA BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') ");
 
 			if (parametros.containsKey("empresaId")) {
@@ -333,7 +333,10 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 	private void processarQueryConferenciaComissao(List<ConferenciaComissaoVO> lsQuery,
 			List<ConferenciaComissaoVO> lsConferencias, String competencia, Date dataMovimento, Date dataInicial, Date dataFinal) throws ParseException {
 		
-		Set<Integer> diasSemMovimentos = DateUtil.carregarDiasCompetencia(competencia, dataMovimento);
+		Set<Integer> diasSemMovimentos = new TreeSet<Integer>() ;
+		if (dataMovimento != null) {
+			DateUtil.carregarDiasCompetencia(competencia, dataMovimento);
+		}
 
 		for (ConferenciaComissaoVO conferenciaComissaoMovimentoDiario : lsQuery) {
 			ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO();