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

fixes bug #8807 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@67983 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2017-04-12 14:40:58 +00:00
parent 2e9163b57c
commit 1ab99e34f3
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,6 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
private Button btnExeRelatorioPendenciaReducaoZ;
private Button btnExeRelatorioVoucherCancelados;
private Boolean isExibirFiltroEstado;
private Boolean isExibirTipoGeracaoArquivo;
private Boolean isExibirCompetencia;
private boolean isExibirDatas;
@ -103,8 +102,6 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
super.doAfterCompose(comp);
isExibirFiltroEstado = true;
defineImportacao();
aplicarMascara();
}
@ -148,7 +145,6 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
boolean isNaoFiscal = Executions.getCurrent().getArg().get("NAO_FISCAL") == null ? Boolean.FALSE : (Boolean) Executions.getCurrent().getArg().get("NAO_FISCAL");
if (isNaoFiscal) {
isExibirFiltroEstado = false;
btnExeImportacionNaoFiscal.setVisible(true);
} else {
btnExeImportacionNaoFiscal.setVisible(false);
@ -474,7 +470,13 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
empresa = (Empresa) itemEmpresa.getValue();
}
File arquivoTxt = fiscalService.importacionNaoFiscal(datInicial.getValue(), datFinal.getValue(), empresa);
Estado estado = null;
Comboitem itemEstado = cmbEstado.getSelectedItem();
if (itemEstado != null) {
estado = (Estado) itemEstado.getValue();
}
File arquivoTxt = fiscalService.importacionNaoFiscal(datInicial.getValue(), datFinal.getValue(), empresa, estado);
File arquivoXls = null;
if (chkArquivoXls.isChecked()) {
arquivoXls = fiscalService.importacionNaoFiscalXls(empresa, arquivoTxt);
@ -621,10 +623,6 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose
this.chkArquivoXls = chkArquivoXls;
}
public Boolean isExibirFiltroEstado() {
return isExibirFiltroEstado;
}
public Boolean isExibirTipoGeracaoArquivo() {
return isExibirTipoGeracaoArquivo;
}

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

@ -50,7 +50,7 @@
constraint="no empty" />
</row>
<row spans="1, 3" visible="@{winBusquedaImportacionFiscal$composer.exibirFiltroEstado}">
<row spans="1, 3">
<label
value="${c:l('busquedaCiudadController.estado.label')}" />
<combobox id="cmbEstado"