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@54753 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2016-04-07 20:46:38 +00:00
parent b080376989
commit 6b51a6d514
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
View File

@ -134,7 +134,7 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" ed.cveestado, ");
sql.append(" b.motivocancelacion_id, ");
sql.append(" b.indstatusboleto ");
sql.append("ORDER BY dataEmissao ");
sql.append("ORDER BY dataEmissao, coo, modeloImpressora ");
List<ImportacionManualFiscalVO> listManuais = new ArrayList<ImportacionManualFiscalVO>();

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

@ -102,7 +102,7 @@ public class FiscalServiceImpl implements FiscalService {
BigDecimal valorICMS = imf.getIcms() == null ? BigDecimal.ZERO : UtileriasFiscal.arredondar(imf.getIcms());
String baseCalICMS = UtileriasFiscal.formataZeroDecimal(valorICMS, 14);
BigDecimal aliquotaCalc = imf.getIcms() == null ? BigDecimal.ZERO : UtileriasFiscal.arredondar(imf.getIcms().divide(CEM));
BigDecimal aliquotaCalc = imf.getIcms() == null ? BigDecimal.ZERO : UtileriasFiscal.arredondar(imf.getIcms());
BigDecimal baseCalculo = UtileriasFiscal.arredondar(imf.getValorTotal());
BigDecimal valorImposto = UtileriasFiscal.arredondar(baseCalculo.multiply(aliquotaCalc.divide(CEM)));
String valorTotalICMS = UtileriasFiscal.formataZeroDecimal(valorImposto, 14);
@ -215,14 +215,19 @@ public class FiscalServiceImpl implements FiscalService {
String valorTotal = UtileriasFiscal.formataZeroDecimal(valorItem, 15);
String aliquotaItem = UtileriasFiscal.formataZeroDecimal(null, 7);
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);
String impostoItem = UtileriasFiscal.formataZeroDecimal(null, 15);
String totalICMSIsentoItem = StringHelper.preencherZeroEsquerda(null, 15);
String totalICMSNaotributadoItem = StringHelper.preencherZeroEsquerda(null, 15);
if (codProduto.indexOf("TA") >= 0) {
BigDecimal aliquotaCalc = UtileriasFiscal.arredondar(imf.getIcms() == null ? BigDecimal.ZERO : imf.getIcms());
BigDecimal baseCalculo = UtileriasFiscal.arredondar(imf.getValorTotal() == null ? BigDecimal.ZERO : imf.getValorTotal());
BigDecimal valorImposto = UtileriasFiscal.arredondar(baseCalculo.multiply(aliquotaCalc.divide(CEM)));
impostoItem = UtileriasFiscal.formataZeroDecimal(valorImposto, 15);
} else {
totalICMSNaotributadoItem = StringHelper.preencherZeroEsquerda(valorTotal, 15);
}
String aliquotaPIS = StringHelper.preencherZeroEsquerda(null, 7);
String valorPIS = StringHelper.preencherZeroEsquerda(null, 15);
String aliquotaCofins = StringHelper.preencherZeroEsquerda(null, 7);