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

fixes bug#16864 

dev: Lucas Silvério
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@98985 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2019-11-22 15:31:05 +00:00
parent d00023cacf
commit e7fa8a0f6e
12 changed files with 53 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.project
View File

@ -5,13 +5,12 @@
<projects>
<project>LibreriasAdmVenta</project>
<project>IntegracaoReceitaDespesa</project>
<project>CustomAdmVenta</project>
<project>WSAG</project>
<project>modelWeb</project>
<project>GeneradorBoletosCNAB</project>
<project>WSTotvs</project>
<project>Flyway</project>
<project>GeneradorBoletosCNAB</project>
<project>CustomAdmVenta</project>
</projects>
<buildSpec>
<buildCommand>
@ -44,8 +43,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>

1
.settings/org.eclipse.core.resources.prefs
View File

@ -1,3 +1,4 @@
eclipse.preferences.version=1
encoding//src/test/java=Cp1252
encoding//web/WEB-INF/i3-label_es_MX.label=UTF-8
encoding//web/WEB-INF/i3-label_pt_BR.label=UTF-8

2
.settings/org.eclipse.jdt.core.prefs
View File

@ -8,6 +8,8 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

4
.settings/org.eclipse.m2e.core.prefs 100644
View File

@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

23
.settings/org.eclipse.wst.common.component
View File

@ -1,38 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="ventaboletosadm">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/web" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/java"/>
<dependent-module archiveName="modelWeb.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/modelWeb/modelWeb">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="CustomAdmVenta.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/CustomAdmVenta/CustomAdmVenta">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="IntegracaoReceitaDespesa.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IntegracaoReceitaDespesa/IntegracaoReceitaDespesa">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="WSAG.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WSAG/WSAG">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="slf4j-log4j12-1.6.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/LibreriasAdmVenta/slf4j-log4j12-1.6.1.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="slf4j-api-1.6.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/LibreriasAdmVenta/slf4j-api-1.6.1.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="GeneradorBoletosCNAB.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/GeneradorBoletosCNAB/GeneradorBoletosCNAB">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="WSTotvs.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WSTotvs/WSTotvs">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="WSAG.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WSAG/WSAG">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="Flyway.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/Flyway/Flyway">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="ckez-3.6.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/LibreriasAdmVenta/ckez-3.6.0.0.jar">
<dependent-module archiveName="GeneradorBoletosCNAB.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/GeneradorBoletosCNAB/GeneradorBoletosCNAB">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/ventaboletosadm/build/classes"/>
<property name="context-root" value="/ventaboletosadm"/>
<property name="context-root" value="ventaboletosadm"/>
</wb-module>
</project-modules>

12
.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 100644
View File

@ -0,0 +1,12 @@
<root>
<facet id="jst.jsf">
<node name="libprov">
<attribute name="provider-id" value="jsf-no-op-library-provider"/>
</node>
</facet>
<facet id="jst.jaxrs">
<node name="libprov">
<attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
</node>
</facet>
</root>

4
.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@ -4,7 +4,9 @@
<fixed facet="java"/>
<fixed facet="jst.web"/>
<fixed facet="wst.jsdt.web"/>
<installed facet="jst.web" version="2.4"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="jst.jsf" version="2.1"/>
<installed facet="jst.jaxrs" version="1.1"/>
<installed facet="java" version="1.6"/>
</faceted-project>

2
.settings/org.eclipse.wst.validation.prefs 100644
View File

@ -0,0 +1,2 @@
disabled=06target
eclipse.preferences.version=1

4
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/BusquedaFechamentoParamgeralController.java
View File

@ -18,7 +18,6 @@ import org.zkoss.zul.Paging;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.FechamentoParamgeral;
import com.rjconsultores.ventaboletos.service.FechamentoParamgeralService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
@ -30,9 +29,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper;
public class BusquedaFechamentoParamgeralController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L;
@Autowired
private FechamentoParamgeralService fechamentoParamgeralService;
@Autowired
private transient PagedListWrapper<FechamentoParamgeral> plwParams;

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarFechamentoParamgeralController.java
View File

@ -84,6 +84,9 @@ public class EditarFechamentoParamgeralController extends MyGenericForwardCompos
private Textbox txtBoletoBancoCarteiraVariavel;
private Textbox txtConvenioEmpresa;
private Textbox txtBoletoBancoInstrucao;
private Textbox txtBoletoBancoInstrucao2;
private Textbox txtBoletoBancoInstrucao3;
private Textbox txtBoletoBancoInstrucaoSacado;
private List<Empresa> lsEmpresas;
private List<String> lsBancosSuportados;
@ -179,6 +182,9 @@ public class EditarFechamentoParamgeralController extends MyGenericForwardCompos
getFechamentoParamgeral().setBoletoBancoContaDigito(txtBoletoBancoContaDigito.getText());
getFechamentoParamgeral().setBoletoDiasVenc(Integer.valueOf(txtBoletoDiasVenc.getText()));
getFechamentoParamgeral().setBoletoBancoInstrucao(txtBoletoBancoInstrucao.getText());
getFechamentoParamgeral().setBoletoBancoInstrucao2(txtBoletoBancoInstrucao2.getText());
getFechamentoParamgeral().setBoletoBancoInstrucao3(txtBoletoBancoInstrucao3.getText());
getFechamentoParamgeral().setBoletoBancoInstrucaoSacado(txtBoletoBancoInstrucaoSacado.getText());
if(cmbEmpresa.getSelectedItem() != null) {
getFechamentoParamgeral().setEmpresa((Empresa) cmbEmpresa.getSelectedItem().getValue());

6
web/WEB-INF/i3-label_es_MX.label
View File

@ -6819,7 +6819,10 @@ busquedaFiscalImpressoraController.estado.label = Estado Local
busquedaFechamentoParamgeralController.window.title = Cierre de cuenta contable
busquedaFechamentoParamgeralController.empresa.label = Empresa
busquedaFechamentoParamgeralController.lbConfiguracoes.label = Configurações Gerais
busquedaFechamentoParamgeralController.lbMensagem.label = Mensagem Boleto
busquedaFechamentoParamgeralController.lbInstrucao.label = 1ª Instrução Boleto
busquedaFechamentoParamgeralController.lbInstrucao2.label = 2ª Instrução Boleto
busquedaFechamentoParamgeralController.lbInstrucao3.label = 3ª Instrução Boleto
busquedaFechamentoParamgeralController.lbInstrucaoSacado.label = Instrução Sacado Boleto
busquedaFechamentoParamgeralController.btnPesquisa.label = Búsqueda
busquedaFechamentoParamgeralController.boletoBancoCod.label = Código Banco
busquedaFechamentoParamgeralController.boletoBancoAgencia.label = Agencia
@ -6829,6 +6832,7 @@ busquedaFechamentoParamgeralController.boletoBancoCarteira.label = Cartera
busquedaFechamentoParamgeralController.boletoDiasVenc.label = Días de vencimiento
busquedaFechamentoParamgeralController.fecmodif.label = Ult. Actual.
busquedaFechamentoParamgeralController.boletoConvenio.label = Conv. Empresa
busquedaFechamentoParamgeralController.countRemessa.label = Contador Remessa
busquedaFechamentoParamgeralController.boletoBancoCarteiraVariavel.label = Variacíon Cartera
busquedaFechamentoParamgeralController.boletoBancoAgenciaDigito.label = Dígito

6
web/WEB-INF/i3-label_pt_BR.label
View File

@ -7177,7 +7177,10 @@ busquedaFiscalImpressoraController.bloquear.label = Bloquear Impressão para UF
busquedaFechamentoParamgeralController.window.title = Configuração de Boleto
busquedaFechamentoParamgeralController.empresa.label = Empresa
busquedaFechamentoParamgeralController.lbConfiguracoes.label = Configurações Gerais
busquedaFechamentoParamgeralController.lbMensagem.label = Mensagem Boleto
busquedaFechamentoParamgeralController.lbInstrucao.label = 1ª Instrução Boleto
busquedaFechamentoParamgeralController.lbInstrucao2.label = 2ª Instrução Boleto
busquedaFechamentoParamgeralController.lbInstrucao3.label = 3ª Instrução Boleto
busquedaFechamentoParamgeralController.lbInstrucaoSacado.label = Instrução Sacado Boleto
busquedaFechamentoParamgeralController.btnPesquisa.label = Pesquisa
busquedaFechamentoParamgeralController.boletoBancoCod.label = Código Banco
busquedaFechamentoParamgeralController.boletoBancoAgencia.label = Agência
@ -7187,6 +7190,7 @@ busquedaFechamentoParamgeralController.boletoBancoCarteira.label = Carteira
busquedaFechamentoParamgeralController.boletoDiasVenc.label = Dias Vencimento
busquedaFechamentoParamgeralController.fecmodif.label = Ult. Atual.
busquedaFechamentoParamgeralController.boletoConvenio.label = Conv. Empresa
busquedaFechamentoParamgeralController.countRemessa.label = Contador Remessa
busquedaFechamentoParamgeralController.boletoBancoCarteiraVariavel.label = Variação Carteira
busquedaFechamentoParamgeralController.boletoBancoAgenciaDigito.label = Dígito