diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ProcessButtonPopup.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ProcessButtonPopup.java index 6889813ab4..1b92aad495 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ProcessButtonPopup.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ProcessButtonPopup.java @@ -60,7 +60,7 @@ public class ProcessButtonPopup extends Menupopup implements EventListener actions = actionPanel.getDocActionItems(); if (actions.size() > 0) { if (this.getChildren().size() > 0) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java index 785d917c93..3d00d56904 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java @@ -69,7 +69,7 @@ public class WDocActionPanel extends Window implements EventListener, Dia /** * */ - private static final long serialVersionUID = -2166149559040327486L; + private static final long serialVersionUID = -3218367479851088526L; private Label lblDocAction; private Label label; @@ -93,6 +93,11 @@ public class WDocActionPanel extends Window implements EventListener, Dia } public WDocActionPanel(GridTab mgridTab) + { + this(mgridTab, false); + } + + public WDocActionPanel(GridTab mgridTab, boolean fromMenu) { gridTab = mgridTab; DocStatus = (String)gridTab.getValue("DocStatus"); @@ -102,15 +107,16 @@ public class WDocActionPanel extends Window implements EventListener, Dia readReference(); initComponents(); - dynInit(); + dynInit(fromMenu); init(); } /** * Dynamic Init - determine valid DocActions based on DocStatus for the different documents. + * @param fromMenu */ - private void dynInit() + private void dynInit(boolean fromMenu) { // @@ -149,7 +155,8 @@ public class WDocActionPanel extends Window implements EventListener, Dia String wfStatus = MWFActivity.getActiveInfo(Env.getCtx(), m_AD_Table_ID, gridTab.getRecord_ID()); if (wfStatus != null) { - FDialog.error(gridTab.getWindowNo(), this, "WFActiveForRecord", wfStatus); + if (! fromMenu) + FDialog.error(gridTab.getWindowNo(), this, "WFActiveForRecord", wfStatus); return; }