From ac064b5e6ed67f5b220f4a91d02125939105baf7 Mon Sep 17 00:00:00 2001 From: julio Date: Mon, 2 Sep 2019 18:47:59 +0000 Subject: [PATCH] fixes bug#15326 dev: julio qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@97180 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/dao/hibernate/BpeHibernateDAO.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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);