From ded7667ace9dfd82bc8f27f1ed0e6812a7500d63 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 26 Feb 2021 20:24:16 +0000
Subject: [PATCH] bug#21751 dev:gleimar qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@105560 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ConferenciaComissaoHibernateDAO.java      |  2 +-
 .../ContaCorrenteAgenciaHibernateDAO.java     |  2 ++
 .../entidad/ContaCorrentePtoVta.java          | 23 ++++++++++++++++++-
 .../ventaboletos/entidad/LogConferencia.java  |  9 ++++----
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 74cf99f02..6b210bd5d 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -1178,7 +1178,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 
 				ContaCorrentePtoVta contaCorrentePtoVta = contaCorrenteAgenciaDAO
 						.gravarContaCorrente(conferencia.getPuntoVenta().getPuntoventaId(),
-								descOperacion, cal.getTime(), logConferencia.getUsuario().getUsuarioId(),
+								descOperacion, DateUtil.normalizarToFecha(cal.getTime()), logConferencia.getUsuario().getUsuarioId(),
 								logConferencia.isIndcredito().equals((short) 1) ? Constantes.TIPO_OPERACION_CC_PAGO : Constantes.TIPO_OPERACION_CC_LQ,
 								conferencia.getEmpresa().getEmpresaId(),
 								Constantes.TURNO_AUTOMATICO, BigDecimal.ZERO, BigDecimal.ZERO,
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java
index 792d384fc..11f6990ea 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java
@@ -60,6 +60,8 @@ public class ContaCorrenteAgenciaHibernateDAO extends GenericHibernateDAO<ContaC
 			ccPtoVta.setTotalVentaSegOpcional(totalVentaSegOpcional);
 			ccPtoVta.setTotalCancSegOpcional(totalCancSegOpcional);
 			ccPtoVta.setIndComissao(Boolean.TRUE);
+			ccPtoVta.setImportetotalDebito(BigDecimal.ZERO);
+			ccPtoVta.setImportetotalCredito(BigDecimal.ZERO);
 
 			getSession().save(ccPtoVta);
 
diff --git a/src/com/rjconsultores/ventaboletos/entidad/ContaCorrentePtoVta.java b/src/com/rjconsultores/ventaboletos/entidad/ContaCorrentePtoVta.java
index f60e1ad0f..fcdba62b7 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/ContaCorrentePtoVta.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/ContaCorrentePtoVta.java
@@ -112,6 +112,12 @@ public class ContaCorrentePtoVta implements Serializable {
 	@Column(name = "IND_COMISSAO")
 	private Boolean indComissao;
 	
+	@Column(name = "IMPORTETOTALDEBITO")
+	private BigDecimal importetotalDebito;
+		
+	@Column(name = "IMPORTETOTALCREDITO")
+	private BigDecimal importetotalCredito;	
+	
 	public ContaCorrentePtoVta() {
 		super();
 	}
@@ -379,6 +385,21 @@ public class ContaCorrentePtoVta implements Serializable {
 	public void setIndComissao(Boolean indComissao) {
 		this.indComissao = indComissao;
 	}
-	
+
+	public BigDecimal getImportetotalDebito() {
+		return importetotalDebito;
+	}
+
+	public void setImportetotalDebito(BigDecimal importetotalDebito) {
+		this.importetotalDebito = importetotalDebito;
+	}
+
+	public BigDecimal getImportetotalCredito() {
+		return importetotalCredito;
+	}
+
+	public void setImportetotalCredito(BigDecimal importetotalCredito) {
+		this.importetotalCredito = importetotalCredito;
+	}
 	
 }
\ No newline at end of file
diff --git a/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java b/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java
index c08a71c68..169870b19 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java
@@ -225,10 +225,11 @@ public class LogConferencia implements Serializable {
 		this.contaCorrentePtoVta = contaCorrentePtoVta;
 	}
 
-	/*
-	 * 0 - Débito
-	 * 1 - Crédito
-	 * 2 - Informativo
+	/**
+	 * <b>Tipos de movimentos</b><br>
+	 * 0 - Débito<br>
+	 * 1 - Crédito<br>
+	 * 2 - Informativo<br>
 	 */
 	public Short isIndcredito() {
 		return indcredito;