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

bug#10873 

dev:valdevir
qua:alberto

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@81163 d1611594-4594-4d17-8e1d-87c2c4800839
master
valdevir 2018-04-19 15:39:27 +00:00
parent b35bdd6f9c
commit 519dda4967
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
View File

@ -187,7 +187,6 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
private Checkbox chkPermitirImpressaoGratuidade;
private Checkbox chkIndBilheteDevDebitoDinheiro;
private Textbox txtEmail;
private Intbox txtCodigoEMTU;
private Checkbox chkHabilitarFidelidade;
private Checkbox chkNaoAlterarDiagrama;
private Intbox intPontuacaoFraudeIni;
@ -203,7 +202,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
"^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@"
+ "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
private static final Pattern pattern = Pattern.compile(EMAIL_PATTERN, Pattern.CASE_INSENSITIVE);
private static final Pattern pattern = Pattern.compile(EditarEmpresaController.EMAIL_PATTERN, Pattern.CASE_INSENSITIVE);
public Empresa getEmpresa() {
return empresa;
@ -462,7 +461,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
args.put("empresaContaBancariaList", empresaContaBancariaList);
openWindow("/gui/catalogos/editarContaBancariaEmpresa.zul",
Labels.getLabel("editarEmpresaController.contaBancaria.window.title"), args, MODAL);
Labels.getLabel("editarEmpresaController.contaBancaria.window.title"), args, MyGenericForwardComposer.MODAL);
}
public void onClick$btnSalvar(Event ev) throws InterruptedException {
@ -493,7 +492,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
if (empresa.getInscricoesEstaduais() != null) {
for (InscricaoEstadual ie : empresa.getInscricoesEstaduais()) {
if (ie.getIsBPe()) {
if (ie.getIsBPe() != null && ie.getIsBPe()) {
isBPe = true;
break;
}
@ -558,7 +557,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
closeWindow();
} catch (Exception ex) {
log.error("editarEmpresaController: " + ex);
EditarEmpresaController.log.error("editarEmpresaController: " + ex);
Messagebox.show(Labels.getLabel(ex.getMessage()),
Labels.getLabel("editarEmpresaController.window.title"), Messagebox.OK, Messagebox.ERROR);
@ -570,7 +569,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
return true;
}
for(String email : txtEmail.getText().split(";")){
Matcher matcher = pattern.matcher(email);
Matcher matcher = EditarEmpresaController.pattern.matcher(email);
if(!matcher.matches()){
return false;
}
@ -709,7 +708,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
args.put("empresaImpostoList", empresaImpostoList);
openWindow("/gui/catalogos/editarEmpresaImposto.zul",
Labels.getLabel("editarEmpresaImpostoController.window.title"), args, MODAL);
Labels.getLabel("editarEmpresaImpostoController.window.title"), args, MyGenericForwardComposer.MODAL);
}
@ -810,7 +809,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
}
} catch (Exception e) {
log.error(e.getMessage(), e);
EditarEmpresaController.log.error(e.getMessage(), e);
Messagebox.show(Labels.getLabel("MSG.Error"),
Labels.getLabel("editarEmpresaController.window.title"),
Messagebox.OK,Messagebox.ERROR);
@ -838,7 +837,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
}
} catch (Exception e) {
log.error(e.getMessage(), e);
EditarEmpresaController.log.error(e.getMessage(), e);
Messagebox.show(Labels.getLabel("MSG.Error"),
Labels.getLabel("editarEmpresaController.window.title"),
Messagebox.OK,Messagebox.ERROR);
@ -874,7 +873,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
}
} catch (Exception e) {
log.error(e.getMessage(), e);
EditarEmpresaController.log.error(e.getMessage(), e);
Messagebox.show(Labels.getLabel("MSG.Error"),
Labels.getLabel("editarEmpresaController.window.title"),
Messagebox.OK,Messagebox.ERROR);
@ -902,7 +901,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
}
} catch (Exception e) {
log.error(e.getMessage(), e);
EditarEmpresaController.log.error(e.getMessage(), e);
Messagebox.show(Labels.getLabel("MSG.Error"),
Labels.getLabel("editarEmpresaController.window.title"),
Messagebox.OK,Messagebox.ERROR);
@ -943,7 +942,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
}
} catch (Exception e) {
log.error(e.getMessage(), e);
EditarEmpresaController.log.error(e.getMessage(), e);
Messagebox.show(Labels.getLabel("MSG.Error"),
Labels.getLabel("editarEmpresaController.window.title"),
Messagebox.OK,Messagebox.ERROR);
@ -971,7 +970,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
}
} catch (Exception e) {
log.error(e.getMessage(), e);
EditarEmpresaController.log.error(e.getMessage(), e);
Messagebox.show(Labels.getLabel("MSG.Error"),
Labels.getLabel("editarEmpresaController.window.title"),
Messagebox.OK,Messagebox.ERROR);
@ -1117,7 +1116,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
Labels.getLabel("editarEmpresaController.contaBancaria.label"),
Messagebox.OK, Messagebox.EXCLAMATION);
} catch (InterruptedException e) {
log.error("editarEmpresaController: " + e);
EditarEmpresaController.log.error("editarEmpresaController: " + e);
}
}
}