From 53df432dc5e8c6068f40a1773a8e67ef64aa9d3d Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 31 Aug 2017 17:52:37 +0200 Subject: [PATCH] IDEMPIERE-3466 Workflow condition applied across all clients / thanks to Pritesh Shah --- org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java b/org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java index 12d64953bf..83426263be 100644 --- a/org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java +++ b/org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java @@ -25,6 +25,7 @@ import org.compiere.model.PO; import org.compiere.model.Query; import org.compiere.model.X_AD_WF_NodeNext; import org.compiere.process.DocAction; +import org.compiere.util.Env; /** * Workflow Node Next - Transition @@ -127,9 +128,9 @@ public class MWFNodeNext extends X_AD_WF_NodeNext if (!requery && m_conditions != null) return m_conditions; // - final String whereClause = MWFNextCondition.COLUMNNAME_AD_WF_NodeNext_ID+"=?"; + final String whereClause = "AD_WF_NodeNext_ID=? AND AD_Client_ID IN (0,?)"; List list = new Query(getCtx(), MWFNextCondition.Table_Name, whereClause, get_TrxName()) - .setParameters(new Object[]{getAD_WF_NodeNext_ID()}) + .setParameters(new Object[]{getAD_WF_NodeNext_ID(), Env.getAD_Client_ID(Env.getCtx())}) .setOnlyActiveRecords(true) .setOrderBy(MWFNextCondition.COLUMNNAME_SeqNo) .list();