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

bug #6817 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@49968 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2015-11-10 18:27:48 +00:00
parent 351cd4d060
commit aef7a093bf
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java
View File

@ -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,