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

Conclusão mantis 6894 

fixes bug 6894

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@50771 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago.penido 2015-11-30 18:38:59 +00:00
parent 5ef9a9989b
commit 9e08645ef1
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
View File

@ -126,8 +126,6 @@ public class EditarPricingController extends MyGenericForwardComposer {
@Autowired @Autowired
private PricingFormapagoService pricingFormapagoService; private PricingFormapagoService pricingFormapagoService;
@Autowired @Autowired
private EmpresaService empresaService;
@Autowired
private MarcaService marcaService; private MarcaService marcaService;
@Autowired @Autowired
private ClaseServicioService claseServicioService; private ClaseServicioService claseServicioService;
@ -266,7 +264,7 @@ public class EditarPricingController extends MyGenericForwardComposer {
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa(); lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa();
lsEmpresa.add(empresaService.obtenerID(-1)); // lsEmpresa.add(empresaService.obtenerID(-1));
pricing = (Pricing) Executions.getCurrent().getArg().get("pricing"); pricing = (Pricing) Executions.getCurrent().getArg().get("pricing");
pricingList = (MyListbox) Executions.getCurrent().getArg().get("pricingList"); pricingList = (MyListbox) Executions.getCurrent().getArg().get("pricingList");
@ -664,11 +662,11 @@ public class EditarPricingController extends MyGenericForwardComposer {
} }
// Empresa // Empresa
Empresa emp = empresaService.obtenerID(-1); // Empresa emp = empresaService.obtenerID(-1);
if (emp != null) { // if (emp != null) {
pricing.setEmpresa(emp); // pricing.setEmpresa(emp);
cmbEmpresa.setText(emp.getNombempresa()); // cmbEmpresa.setText(emp.getNombempresa());
} // }
} }
// Tipo Pasajero - Categoria // Tipo Pasajero - Categoria
@ -2261,14 +2259,6 @@ public class EditarPricingController extends MyGenericForwardComposer {
btnSalvar.setDisabled(desativar); btnSalvar.setDisabled(desativar);
} }
public EmpresaService getEmpresaService() {
return empresaService;
}
public void setEmpresaService(EmpresaService empresaService) {
this.empresaService = empresaService;
}
public List<Empresa> getLsEmpresa() { public List<Empresa> getLsEmpresa() {
return lsEmpresa; return lsEmpresa;
} }