diff --git a/product/ERP5SyncML/Conduit/ERP5Conduit.py b/product/ERP5SyncML/Conduit/ERP5Conduit.py index 0addb39ffc207fa85d27f1cc502d958cf1b3e2ef..54f80667af905dab21ff5f9928e93ac3f5a4f7b6 100755 --- a/product/ERP5SyncML/Conduit/ERP5Conduit.py +++ b/product/ERP5SyncML/Conduit/ERP5Conduit.py @@ -953,6 +953,8 @@ class ERP5Conduit(XMLSyncUtilsMixin): instead go to a conflict state. """ # We first test if the status in not already inside the workflow_history + return 1 + # XXX Disable for now wf_history = object.workflow_history if wf_history.has_key(wf_id): action_list = wf_history[wf_id]