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

fixes bug #9397 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@71513 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2017-07-18 19:45:41 +00:00
parent 72aeff755d
commit 2e71bdb802
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java
View File

@ -76,6 +76,8 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
private Checkbox chkArquivoTxt; private Checkbox chkArquivoTxt;
private Checkbox chkArquivoXls; private Checkbox chkArquivoXls;
private Checkbox chkBoletoHist;
private Button btnExeImportacionEcfRedZ; private Button btnExeImportacionEcfRedZ;
private Button btnExeImportacionEcf; private Button btnExeImportacionEcf;
private Button btnExeImportacionEcfCancelados; private Button btnExeImportacionEcfCancelados;
@ -214,7 +216,7 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
} }
try { 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>(); Map<String, Object> parametros = new HashMap<String, Object>();
parametros.put("ecfInvalidos", (List<ImportacionFiscalVO>) retorno.get("ecfInvalidos")); parametros.put("ecfInvalidos", (List<ImportacionFiscalVO>) retorno.get("ecfInvalidos"));
@ -265,7 +267,7 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
} }
try { 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; File arquivoXls = null;
if (chkArquivoXls.isChecked()) { if (chkArquivoXls.isChecked()) {
arquivoXls = fiscalService.importacionFiscalECFManualXls(empresa, arquivoTxt); arquivoXls = fiscalService.importacionFiscalECFManualXls(empresa, arquivoTxt);
@ -317,7 +319,7 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
} }
try { 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; File arquivoXls = null;
if (chkArquivoXls.isChecked()) { if (chkArquivoXls.isChecked()) {
arquivoXls = fiscalService.importacionFiscalECFXls(empresa, arquivoTxt); arquivoXls = fiscalService.importacionFiscalECFXls(empresa, arquivoTxt);

4
web/gui/impressaofiscal/busquedaImportacionFiscal.zul
View File

@ -76,6 +76,10 @@
</row> </row>
<row spans="1, 3">
<label value="Dados Antigos" />
<checkbox id="chkBoletoHist" />
</row>
</rows> </rows>
</grid> </grid>