From f387df3117ac909172444e29bafd204e8bcfcf0f Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 19 May 2017 19:43:28 +0000
Subject: [PATCH] bug #8977

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@69122 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/FiscalHibernateDAO.java             | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
index 8e6de85b6..f5c7e1738 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
@@ -2408,7 +2408,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 
 			if (serie == null) {
 				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();
 				data = brp.getFechorVenta();
 			} else {
@@ -2420,7 +2420,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 						impRmd.setNumero(brp.getFolio().toString());
 						list.add(impRmd);
 						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();
 						data = brp.getFechorVenta();
 					}
@@ -2429,7 +2429,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 					impRmd.setNumero(brp.getFolio().toString());
 					list.add(impRmd);
 					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();
 					data = brp.getFechorVenta();
 				}
@@ -2515,7 +2515,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 
 				}
 			}
-			
+						
 			impRmd.getDetalhada().add(brp);
 			anteriorFolio = Integer.parseInt(brp.getCcf());
 		}
@@ -2536,6 +2536,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 			BigDecimal icms = BigDecimal.ZERO;
 			BigDecimal isentos = BigDecimal.ZERO;
 			BigDecimal outros = BigDecimal.ZERO;
+			String cooFim = null;
 
 			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)));
 					outros = outros.add(valorContabil.subtract(baseCalculo));
 				}
+				cooFim = brp.getCoo();
 			}
+			impRmd.setNumero(cooFim);
 			impRmd.setValorContabil(valorContabil);
 			impRmd.setBaseCalculo(baseCalculo);
 			impRmd.setAliquota(aliquota);