From 34f750df7319bd6c501b6bf4d0e0f758b0a21301 Mon Sep 17 00:00:00 2001
From: "rafael.henrique" <rafael.henrique@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 12 Jul 2017 20:37:16 +0000
Subject: [PATCH] fixes bug#9063

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@71284 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../hibernate/ConferenciaComissaoHibernateDAO.java    |  2 ++
 .../ventaboletos/entidad/ComEmpConferencia.java       | 11 +++++++++++
 .../ventaboletos/entidad/ComEmpTipoEventoExtra.java   |  5 ++---
 .../service/impl/ConferenciaComissaoServiceImpl.java  |  3 ++-
 .../vo/comissao/EventosFinanceirosVO.java             | 10 ++++++++++
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 5e1ad957f..792af14c7 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -620,6 +620,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("LOG.STATUS AS \"status\", FP.FORMAPAGO_ID AS \"formapagoId\", FP.DESCPAGO AS \"descpago\", ")
 					.append("TEE.INDTIPO AS \"indtipo\", U.NOMBUSUARIO AS \"nombusuario\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\",  ")
 					.append("COMFP.COMEMPFORMAPAGO_ID AS \"comempformapagoId\", COMTEE.COMEMPTIPOEVENTOEXTRA_ID AS \"comemptipoeventoextraId\", ")
+					.append("COALESCE(CEC.INDTIPO_DEB_CRED, 0)  AS \"tipoeventoextradebcred\", ")
 					.append("CEC.INDEVENTOSFINANCEIROS AS \"exigeConferenciaAba\", B.NUMFOLIOSISTEMA \"numFolioSistema\" ")
 					.append("FROM EVENTO_EXTRA EE ")
 					.append("JOIN TIPO_EVENTO_EXTRA TEE ON EE.TIPOEVENTOEXTRA_ID = TEE.TIPOEVENTOEXTRA_ID ")
@@ -656,6 +657,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.addScalar("descpago", Hibernate.STRING)
 					.addScalar("comempformapagoId", Hibernate.INTEGER)
 					.addScalar("comemptipoeventoextraId", Hibernate.INTEGER)
+					.addScalar("tipoeventoextradebcred", Hibernate.INTEGER)
 					.addScalar("indtipo", Hibernate.STRING)
 					.addScalar("nombusuario", Hibernate.STRING)
 					.addScalar("logconferenciaId", Hibernate.LONG)
diff --git a/src/com/rjconsultores/ventaboletos/entidad/ComEmpConferencia.java b/src/com/rjconsultores/ventaboletos/entidad/ComEmpConferencia.java
index 68a0666b2..c9f6632bb 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/ComEmpConferencia.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/ComEmpConferencia.java
@@ -59,6 +59,9 @@ public class ComEmpConferencia implements Serializable {
 	@JoinColumn(name = "EMPRESA_ID")
 	private Empresa empresa;
 	
+	@Column(name = "INDTIPO_DEB_CRED")
+	private Integer tipoDebitoCredito;
+	
 	@Column(name = "ACTIVO")
 	private boolean activo;
 	
@@ -217,5 +220,13 @@ public class ComEmpConferencia implements Serializable {
 	public void setIndocd(Boolean indocd) {
 		this.indocd = indocd;
 	}	
+	
+	public Integer getTipoDebitoCredito() {
+		return tipoDebitoCredito;
+	}
+	
+	public void setTipoDebitoCredito(int tipoDebitoCredito) {
+		this.tipoDebitoCredito = tipoDebitoCredito;
+	}
 
 }
diff --git a/src/com/rjconsultores/ventaboletos/entidad/ComEmpTipoEventoExtra.java b/src/com/rjconsultores/ventaboletos/entidad/ComEmpTipoEventoExtra.java
index 262d645d8..fe64b89cb 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/ComEmpTipoEventoExtra.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/ComEmpTipoEventoExtra.java
@@ -34,7 +34,7 @@ public class ComEmpTipoEventoExtra implements Serializable {
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "TIPOEVENTOEXTRA_ID")
 	private TipoEventoExtra tipoEventoExtra;
-
+	
 	@Column(name = "ACTIVO")
 	private boolean activo;
 	@Column(name = "USUARIO_ID")
@@ -66,7 +66,7 @@ public class ComEmpTipoEventoExtra implements Serializable {
 	public void setTipoEventoExtra(TipoEventoExtra tipoEventoExtra) {
 		this.tipoEventoExtra = tipoEventoExtra;
 	}
-
+	
 	public boolean isActivo() {
 		return activo;
 	}
@@ -113,5 +113,4 @@ public class ComEmpTipoEventoExtra implements Serializable {
 			return false;
 		return true;
 	}
-
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
index 3210307d1..859ea8dd5 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
@@ -430,7 +430,8 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 	@Override
 	public boolean isEventosFinanceirosSemConferencia(List<EventosFinanceirosVO> lsEventosFinanceiros) throws BusinessException {
 		for (EventosFinanceirosVO eventosFinanceiros : lsEventosFinanceiros) {
-			if ((eventosFinanceiros.isExigeConferencia() || (eventosFinanceiros.getExigeConferenciaAba() != null && eventosFinanceiros.getExigeConferenciaAba())) &&
+			if ((eventosFinanceiros.isExigeConferencia() || (eventosFinanceiros.getExigeConferenciaAba() != null && eventosFinanceiros.getExigeConferenciaAba())
+					|| eventosFinanceiros.getTipoeventoextradebcred().intValue() != 0) &&
 					(!eventosFinanceiros.isConferido() && eventosFinanceiros.getLogconferenciaId() == null)) {
 				return true;
 			}
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java b/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java
index b6985fa3a..7adb7dac2 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java
@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import org.apache.commons.lang.StringUtils;
+import org.hibernate.Hibernate;
 import org.zkoss.util.resource.Labels;
 
 import com.rjconsultores.ventaboletos.entidad.Conferencia;
@@ -25,6 +26,7 @@ public class EventosFinanceirosVO {
 	private String nombusuario;
 
 	private Integer comemptipoeventoextraId;
+	private Integer tipoeventoextradebcred;
 	private Integer comempformapagoId;
 
 	private Long logconferenciaId;
@@ -178,6 +180,14 @@ public class EventosFinanceirosVO {
 	public void setComemptipoeventoextraId(Integer comemptipoeventoextraId) {
 		this.comemptipoeventoextraId = comemptipoeventoextraId;
 	}
+	
+	public Integer getTipoeventoextradebcred() {
+		return tipoeventoextradebcred;
+	}
+	
+	public void setTipoeventoextradebcred(Integer tipoeventoextradebcred) {
+		this.tipoeventoextradebcred = tipoeventoextradebcred;
+	}
 
 	public Integer getComempformapagoId() {
 		return comempformapagoId;