From b544971f09a85c6927dbff0e87e0231ee5c7fb54 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 11 Apr 2016 13:32:57 +0000
Subject: [PATCH] fixes bug #7265

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 96f596b50..3b97754a4 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -721,7 +721,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				  .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.OCD_ID = O.OCD_ID ")
 				  .append("INNER JOIN USUARIO U ON O.USUARIOPAGO_ID = U.USUARIO_ID ")
 				  .append("WHERE O.ACTIVO = 1 ")
-				  .append("AND TO_DATE(O.FECINC,'DD/MM/YY') = :datamovimento ")
+				  .append("AND TO_DATE(O.FECPAGO,'DD/MM/YY') = :datamovimento ")
 				  .append("AND O.INDPAGO = 1 ");
 			
 			parametros.put("datamovimento", conferencia.getDatamovimento());
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
index 139057c16..5833be7cb 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
@@ -288,9 +288,9 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 				if(boletoComissao.getOcdId() != null) {
 					totalOcd = totalOcd.add(boletoComissao.getTotal());
 				} else if(boletoComissao.getIndstatusboleto().equals(IndStatusBoleto.C.getShortValue())) {
-					totalDevolvidos = totalOcd.add(boletoComissao.getTotal());
+					totalDevolvidos = totalDevolvidos.add(boletoComissao.getTotal());
 				} else if(boletoComissao.getIndstatusboleto().equals(IndStatusBoleto.T.getShortValue())) {
-					totalTroca = totalOcd.add(boletoComissao.getTotal());
+					totalTroca = totalTroca.add(boletoComissao.getTotal());
 				}
 			}
 		}