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

fixes bug #9607 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@72773 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-08-21 19:59:19 +00:00
parent cd82ad33e8
commit 8c0e540652
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,6 +149,7 @@ public class EditarConvenioController extends MyGenericForwardComposer {
private Combobox cmbEmpresa; private Combobox cmbEmpresa;
private MyListbox empresaList; private MyListbox empresaList;
private List<ConvenioEmpresa> lsConvenioEmpresa; private List<ConvenioEmpresa> lsConvenioEmpresa;
private List<Empresa> lsEmpresa;
//Ruta //Ruta
private Combobox cmbRuta; private Combobox cmbRuta;
@ -378,6 +379,7 @@ public class EditarConvenioController extends MyGenericForwardComposer {
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp); super.doAfterCompose(comp);
lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa();
lsRutasCombo = rutaService.obtenerTodos(); lsRutasCombo = rutaService.obtenerTodos();
convenio = (Convenio) Executions.getCurrent().getArg().get("convenio"); convenio = (Convenio) Executions.getCurrent().getArg().get("convenio");
@ -1532,5 +1534,9 @@ public class EditarConvenioController extends MyGenericForwardComposer {
txtNomeCliente.focus(); txtNomeCliente.focus();
} }
} }
public List<Empresa> getLsEmpresa() {
return lsEmpresa;
}
} }

7
web/gui/configuraciones_comerciales/editarConvenio.zul
View File

@ -406,9 +406,10 @@
<rows> <rows>
<row> <row>
<label value="${c:l('editarConvenioController.tabEmpresa.value')}" /> <label value="${c:l('editarConvenioController.tabEmpresa.value')}" />
<combobox id="cmbEmpresa" <combobox id="cmbEmpresa"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEmpresa" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
mold="rounded" buttonVisible="true" width="90%" /> mold="rounded" width="200px"
model="@{winEditarConvenio$composer.lsEmpresa}" />
</row> </row>
<row> <row>
<label value=" " /> <label value=" " />