diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java index 469b28692..335ffb670 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java @@ -579,8 +579,13 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO { agr.setAliquota(detail.getAliquota() == null ? BigDecimal.ZERO : detail.getAliquota()); agr.setIcms(MoneyHelper.somar(agr.getIcms(), detail.getIcms())); agr.setCp(detail.getCp() == null ? BigDecimal.ZERO : detail.getCp()); - agr.setCredPres(MoneyHelper.somar(agr.getCredPres(), detail.getCredPres())); - agr.setIcmsRec(MoneyHelper.somar(agr.getIcmsRec(), detail.getIcmsRec())); + + BigDecimal credPres = agr.getIcms().multiply(agr.getCp()).divide(new BigDecimal("100")); + BigDecimal icmsRec = agr.getIcms().subtract(credPres); + + agr.setCredPres(credPres); + agr.setIcmsRec(icmsRec); + return agr; } @@ -675,8 +680,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO { cp = det.getPorcRedMunicipal() == null ? BigDecimal.ZERO : det.getPorcRedMunicipal(); } - BigDecimal cpPor = MoneyHelper.dividir(cp, BigDecimal.TEN.multiply(BigDecimal.TEN)); - BigDecimal credPres = MoneyHelper.multiplicar(icms, cpPor); + BigDecimal credPres = MoneyHelper.dividir(MoneyHelper.multiplicar(icms, cp), new BigDecimal("100")); BigDecimal icmsRec = MoneyHelper.subtrair(icms, credPres); BigDecimal vRedBC = new BigDecimal(pRedBC == null ? "0.0" : pRedBC);