From 594ff0b8bacb2b99b808c1cf6347d11585379bb7 Mon Sep 17 00:00:00 2001 From: julio Date: Mon, 22 Jun 2015 19:58:38 +0000 Subject: [PATCH] =?UTF-8?q?RMD=20-=20Arquivo=20Exporta=C3=A7=C3=A3o=20para?= =?UTF-8?q?=20QS=20(fixes=20bug=200006374)=20-=20Parte=202=20-=20REDU?= =?UTF-8?q?=C3=87=C3=83O=20Z=20Tempo:=2015=20horas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@45272 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../BusquedaImportacionFiscalController.java | 19 ++++++++++++++++++- web/WEB-INF/i3-label_pt_BR.label | 3 ++- .../busquedaImportacionFiscal.zul | 4 +++- 3 files changed, 23 insertions(+), 3 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 8eb8da7b2..240adf2fa 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 @@ -58,12 +58,29 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose try { File arquivo = fiscalService.importacionFiscalECF(datInicial.getValue(), datFinal.getValue(), empresa); InputStream is = new FileInputStream(arquivo); - Filedownload.save(is, "application/notepad", "fiscal_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmm") + ".txt"); arquivo.delete(); } catch (FileNotFoundException e) { log.error("", e); } + } + + public void onClick$btnExeImportacionReducaoZ(Event ev) throws InterruptedException { + + Empresa empresa = null; + Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); + if (itemEmpresa != null) { + empresa = (Empresa) itemEmpresa.getValue(); + } + + try { + File arquivo = fiscalService.importacionFiscalReducaoZ(datInicial.getValue(), datFinal.getValue(), empresa); + InputStream is = new FileInputStream(arquivo); + Filedownload.save(is, "application/notepad", "fiscal_reducao_z" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmm") + ".txt"); + arquivo.delete(); + } catch (FileNotFoundException e) { + log.error("", e); + } } diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 59bf4d9f1..7b640e7c5 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -5368,7 +5368,8 @@ busquedaImportacionFiscalController.window.title=Impressão Fiscal :: Importaç busquedaImportacionFiscalController.btnPesquisa.label=Pesquisar busquedaImportacionFiscalController.lbDataIni.value = Data Inicio busquedaImportacionFiscalController.lbDataFin.value = Data Final -busquedaImportacionFiscalController.btnExe.label = Importar Dados Fiscais +busquedaImportacionFiscalController.btnExe.label = Importar Dados Fiscais ECF +busquedaImportacionFiscalController.btnExeImportacionReducaoZ.label = Importar Dados Fiscais Redução Z editarRelgerencialEmpresaController.MSG.suscribirOK=Relatorio Gerencial gravado com sucesso! editarRelgerencialEmpresaController.window.title=Impressão Fiscal :: Editar Relatorio Gerencial diff --git a/web/gui/impressaofiscal/busquedaImportacionFiscal.zul b/web/gui/impressaofiscal/busquedaImportacionFiscal.zul index aa9c28cfb..7cc2b0021 100644 --- a/web/gui/impressaofiscal/busquedaImportacionFiscal.zul +++ b/web/gui/impressaofiscal/busquedaImportacionFiscal.zul @@ -44,8 +44,10 @@ -