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

bug #8977 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@69122 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2017-05-19 19:43:28 +00:00
parent 081c9686cf
commit f387df3117
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2408,7 +2408,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
if (serie == null) { if (serie == null) {
impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(), impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(),
brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie()); brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie(), folio);
serie = brp.getSerie(); serie = brp.getSerie();
data = brp.getFechorVenta(); data = brp.getFechorVenta();
} else { } else {
@ -2420,7 +2420,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
impRmd.setNumero(brp.getFolio().toString()); impRmd.setNumero(brp.getFolio().toString());
list.add(impRmd); list.add(impRmd);
impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(), impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(),
brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie()); brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie(), folio);
serie = brp.getSerie(); serie = brp.getSerie();
data = brp.getFechorVenta(); data = brp.getFechorVenta();
} }
@ -2429,7 +2429,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
impRmd.setNumero(brp.getFolio().toString()); impRmd.setNumero(brp.getFolio().toString());
list.add(impRmd); list.add(impRmd);
impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(), impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(),
brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie()); brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", "", brp.getSerie(), folio);
serie = brp.getSerie(); serie = brp.getSerie();
data = brp.getFechorVenta(); data = brp.getFechorVenta();
} }
@ -2536,6 +2536,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
BigDecimal icms = BigDecimal.ZERO; BigDecimal icms = BigDecimal.ZERO;
BigDecimal isentos = BigDecimal.ZERO; BigDecimal isentos = BigDecimal.ZERO;
BigDecimal outros = BigDecimal.ZERO; BigDecimal outros = BigDecimal.ZERO;
String cooFim = null;
for (DetalhadoRMD brp : impRmd.getDetalhada()) { for (DetalhadoRMD brp : impRmd.getDetalhada()) {
@ -2548,7 +2549,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
icms = baseCalculo.multiply(aliquota.divide(BigDecimal.TEN.multiply(BigDecimal.TEN))); icms = baseCalculo.multiply(aliquota.divide(BigDecimal.TEN.multiply(BigDecimal.TEN)));
outros = outros.add(valorContabil.subtract(baseCalculo)); outros = outros.add(valorContabil.subtract(baseCalculo));
} }
cooFim = brp.getCoo();
} }
impRmd.setNumero(cooFim);
impRmd.setValorContabil(valorContabil); impRmd.setValorContabil(valorContabil);
impRmd.setBaseCalculo(baseCalculo); impRmd.setBaseCalculo(baseCalculo);
impRmd.setAliquota(aliquota); impRmd.setAliquota(aliquota);