From 5b1d829a9c6afca335be16cf80d2091c77debd92 Mon Sep 17 00:00:00 2001 From: alberto Date: Mon, 23 Jan 2017 13:36:15 +0000 Subject: [PATCH] =?UTF-8?q?Exporta=C3=A7=C3=A3o=20Fiscal=20:=20ECF=20e=20R?= =?UTF-8?q?MD=20(issue=208120)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@65170 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/FiscalHibernateDAO.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 3a4f1a2d9..7a8cbbe46 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -1432,6 +1432,10 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO BigDecimal tributacao_importacao = rs.getBigDecimal("tributacao_importacao"); BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; + if (tributacao_importacao != null) { + tributacao_importacao = tributacao_importacao.divide(BigDecimal.valueOf(100d)); + } + if (red_base_calc_icms != null) { valorBaseCalculoICMS = valorTotal.subtract(valorTotal.multiply(red_base_calc_icms.divide(BigDecimal.valueOf(100d)))); } else { @@ -1532,6 +1536,10 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO BigDecimal tributacao_importacao = rs.getBigDecimal("tributacao_importacao"); BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; + if (tributacao_importacao != null) { + tributacao_importacao = tributacao_importacao.divide(BigDecimal.valueOf(100d)); + } + if (red_base_calc_icms != null) { valorBaseCalculoICMS = valorTotal.subtract(valorTotal.multiply(red_base_calc_icms.divide(BigDecimal.valueOf(100d)))); } else { @@ -1659,7 +1667,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" join parada pd on pd.parada_id = b.destino_id"); sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); sb.append(" join estado ed on ed.estado_id = cd.estado_id"); - sb.append(" join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id and ei.estado_id = ed.estado_id"); + sb.append(" join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id and ei.estado_id = eo.estado_id"); sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and s.corrida_id = b.corrida_id and s.ruta_id = b.ruta_id"); sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); @@ -1701,6 +1709,10 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO BigDecimal tributacao_importacao = rs.getBigDecimal("tributacao_importacao"); BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; + if (tributacao_importacao != null) { + tributacao_importacao = tributacao_importacao.divide(BigDecimal.valueOf(100d)); + } + if (red_base_calc_icms != null) { valorBaseCalculoICMS = valorTotal.subtract(valorTotal.multiply(red_base_calc_icms.divide(BigDecimal.valueOf(100d)))); } else { @@ -2134,6 +2146,10 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO BigDecimal valorIsenta = BigDecimal.ZERO; BigDecimal valorIsentaOutros = BigDecimal.ZERO; + if (tributacao_importacao != null) { + tributacao_importacao = tributacao_importacao.divide(BigDecimal.valueOf(100d)); + } + if (rs.getInt("reg_metropolitana") == 1) { valorIsenta = valorTotal; valorTotal = BigDecimal.ZERO; @@ -2174,7 +2190,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO } } - BigDecimal porc = tributacao_importacao.subtract(porc_red); + BigDecimal porc = tributacao_importacao.subtract(porc_red.divide(BigDecimal.valueOf(100d))); valorIsentaOutros = valorTotal.multiply(porc); }