midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Merge revisions 6393 from branches/adempiere341

This commit is contained in:
Heng Sin Low 2008-09-08 03:31:13 +00:00
parent 76dbf6e3c2
commit 9ba9887804
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInOutGen.java
View File

@ -57,6 +57,7 @@ import org.compiere.util.*;
import org.zkoss.zk.au.out.AuEcho; import org.zkoss.zk.au.out.AuEcho;
import org.zkoss.zk.ui.DesktopUnavailableException; import org.zkoss.zk.ui.DesktopUnavailableException;
import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.util.Clients; import org.zkoss.zk.ui.util.Clients;
@ -222,6 +223,7 @@ public class WInOutGen extends ADForm implements EventListener, ValueChangeListe
fWarehouse = new WTableDirEditor ("M_Warehouse_ID", true, false, true, orgL); fWarehouse = new WTableDirEditor ("M_Warehouse_ID", true, false, true, orgL);
lWarehouse.setText(Msg.translate(Env.getCtx(), "M_Warehouse_ID")); lWarehouse.setText(Msg.translate(Env.getCtx(), "M_Warehouse_ID"));
fWarehouse.addValueChangeListener(this); fWarehouse.addValueChangeListener(this);
fWarehouse.setValue(Env.getContextAsInt(Env.getCtx(), "#M_Warehouse_ID"));
m_M_Warehouse_ID = fWarehouse.getValue(); m_M_Warehouse_ID = fWarehouse.getValue();
// C_Order.C_BPartner_ID // C_Order.C_BPartner_ID
MLookup bpL = MLookupFactory.get (Env.getCtx(), m_WindowNo, 0, 2762, DisplayType.Search); MLookup bpL = MLookupFactory.get (Env.getCtx(), m_WindowNo, 0, 2762, DisplayType.Search);
@ -433,6 +435,11 @@ public class WInOutGen extends ADForm implements EventListener, ValueChangeListe
executeQuery(); executeQuery();
return; return;
} }
if (m_selectionActive &&
(m_M_Warehouse_ID == null || (Integer)m_M_Warehouse_ID <= 0)) {
throw new WrongValueException(fWarehouse.getComponent(), Msg.translate(Env.getCtx(), "FillMandatory"));
}
// //
saveSelection(); saveSelection();
if (selection != null if (selection != null

1
zkwebui/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
View File

@ -126,6 +126,7 @@ ContextMenuListener, IZoomableEditor
if (lookup != null) if (lookup != null)
{ {
lookup.addListDataListener(this); lookup.addListDataListener(this);
lookup.setMandatory(isMandatory());
if ((lookup.getDisplayType() == DisplayType.List && Env.getContextAsInt(Env.getCtx(), "#AD_Role_ID") == 0) if ((lookup.getDisplayType() == DisplayType.List && Env.getContextAsInt(Env.getCtx(), "#AD_Role_ID") == 0)
|| lookup.getDisplayType() != DisplayType.List) || lookup.getDisplayType() != DisplayType.List)