fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug #7265 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@54840 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-04-11 13:32:57 +00:00
parent 57a20ad381
commit b544971f09
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
View File

@ -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());

4
src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
View File

@ -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());
}
}
}