From 2e71bdb802c8a98693365e8afabe05d6858b0fb2 Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 18 Jul 2017 19:45:41 +0000
Subject: [PATCH] fixes bug #9397

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@71513 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../BusquedaImportacionFiscalController.java              | 8 +++++---
 web/gui/impressaofiscal/busquedaImportacionFiscal.zul     | 8 ++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java
index eefacd51f..5aabef37b 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java
@@ -76,6 +76,8 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
 	private Checkbox chkArquivoTxt;
 	private Checkbox chkArquivoXls;
 
+	private Checkbox chkBoletoHist;
+	
 	private Button btnExeImportacionEcfRedZ;
 	private Button btnExeImportacionEcf;
 	private Button btnExeImportacionEcfCancelados;
@@ -214,7 +216,7 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
 		}
 
 		try {
-			HashMap<String, Object> retorno = fiscalService.importacionFiscalECFValidaReducaoZ(datInicial.getValue(), datFinal.getValue(), empresa, estado);
+			HashMap<String, Object> retorno = fiscalService.importacionFiscalECFValidaReducaoZ(datInicial.getValue(), datFinal.getValue(), empresa, estado, chkBoletoHist.isChecked());
 
 			Map<String, Object> parametros = new HashMap<String, Object>();
 			parametros.put("ecfInvalidos", (List<ImportacionFiscalVO>) retorno.get("ecfInvalidos"));
@@ -265,7 +267,7 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
 		}
 
 		try {
-			File arquivoTxt = fiscalService.importacionFiscalECFManual(datInicial.getValue(), datFinal.getValue(), empresa, estado);
+			File arquivoTxt = fiscalService.importacionFiscalECFManual(datInicial.getValue(), datFinal.getValue(), empresa, estado, chkBoletoHist.isChecked());
 			File arquivoXls = null;
 			if (chkArquivoXls.isChecked()) {
 				arquivoXls = fiscalService.importacionFiscalECFManualXls(empresa, arquivoTxt);
@@ -317,7 +319,7 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
 		}
 
 		try {
-			File arquivoTxt = fiscalService.importacionFiscalECF(datInicial.getValue(), datFinal.getValue(), empresa, estado);
+			File arquivoTxt = fiscalService.importacionFiscalECF(datInicial.getValue(), datFinal.getValue(), empresa, estado, chkBoletoHist.isChecked());
 			File arquivoXls = null;
 			if (chkArquivoXls.isChecked()) {
 				arquivoXls = fiscalService.importacionFiscalECFXls(empresa, arquivoTxt);
diff --git a/web/gui/impressaofiscal/busquedaImportacionFiscal.zul b/web/gui/impressaofiscal/busquedaImportacionFiscal.zul
index c4cc0b959..82e90d867 100644
--- a/web/gui/impressaofiscal/busquedaImportacionFiscal.zul
+++ b/web/gui/impressaofiscal/busquedaImportacionFiscal.zul
@@ -74,8 +74,12 @@
 						<checkbox id="chkArquivoXls" />
 					</div>
 
-				</row>				
-
+				</row>		
+				
+				<row spans="1, 3">
+					<label value="Dados Antigos" />
+					<checkbox id="chkBoletoHist" />
+				</row>
 			</rows>
 		</grid>