From aef7a093bf0f5c51d2c82d2a1f6baf570a175c81 Mon Sep 17 00:00:00 2001 From: julio Date: Tue, 10 Nov 2015 18:27:48 +0000 Subject: [PATCH] bug #6817 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@49968 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../service/impl/FiscalServiceImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java index d6a37f9d3..c89ccd2be 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java @@ -179,8 +179,8 @@ public class FiscalServiceImpl implements FiscalService { String aliquotaItem = UtileriasFiscal.formataZeroDecimal(null, 7); - BigDecimal aliquotaCalc = UtileriasFiscal.arredondar(imf.getIcms().divide(CEM)); - BigDecimal baseCalculo = UtileriasFiscal.arredondar(imf.getValorTotal()); + BigDecimal aliquotaCalc = UtileriasFiscal.arredondar(imf.getIcms() == null ? BigDecimal.ZERO : imf.getIcms().divide(CEM)); + BigDecimal baseCalculo = UtileriasFiscal.arredondar(imf.getValorTotal() == null ? BigDecimal.ZERO : imf.getValorTotal()); BigDecimal valorImposto = UtileriasFiscal.arredondar(baseCalculo.multiply(aliquotaCalc.divide(CEM))); String impostoItem = UtileriasFiscal.formataZeroDecimal(valorImposto, 15); @@ -488,10 +488,13 @@ public class FiscalServiceImpl implements FiscalService { String origen = StringHelper.preencherStringEspacoEsquerda(fiscal.getOrigenId().toString(), 5); String destino = StringHelper.preencherStringEspacoEsquerda(fiscal.getDestinoId().toString(), 5); - if (!jaCadastrado) + String seqHeader = null; + if (!jaCadastrado) { seq++; - - String seqHeader = StringHelper.preencherZeroEsquerda(Integer.valueOf(seq - 1).toString(), 6); + seqHeader = StringHelper.preencherZeroEsquerda(Integer.valueOf(seq).toString(), 6); + } else { + seqHeader = StringHelper.preencherZeroEsquerda(Integer.valueOf(seq - 1).toString(), 6); + } header = headerDocumentoFiscal("1", data, cnpjFilial, coo, serie, especie, codigoCliente, filialCliente, condicaoPagamento, valorTotalDocumanto, valorItens, aliquota, imposto,