Use Workflow.disable decorator rather than volatile.

Rewrite fb9ab20f as the volatile usage is
wrong as the object may be unloaded to save space (and thus workflows enabled)
before editDocument() is actually finished.

product/ERP5SyncML/Conduit/ERP5Conduit.py

@@ -32,6 +32,7 @@ from Products.ERP5SyncML.XMLSyncUtils import getXupdateObject
 from Products.ERP5Type.Utils import deprecated
 from Products.ERP5Type.XMLExportImport import MARSHALLER_NAMESPACE_URI
 from Products.CMFCore.utils import getToolByName
+from Products.ERP5Type.Base import WorkflowMethod
 from DateTime.DateTime import DateTime
 from email.mime.base import MIMEBase
 from email import encoders
@@ -979,16 +980,20 @@ class ERP5Conduit(XMLSyncUtilsMixin):
     return conflict_list
 
   security.declareProtected(Permissions.ModifyPortalContent, 'editDocument')
+
+  # XXX Ugly hack to avoid calling interaction workflow when synchronizing
+  # objects with ERP5SyncML as it leads to unwanted side-effects on the object
+  # being synchronized, such as undesirable workflow history being added (for
+  # example edit_workflow) and double conversion for OOo documents (for
+  # example document_conversion_interaction_workflow defined for _setData())
+  # making the source and destination XML representation different.
+  @WorkflowMethod.disable
   def editDocument(self, object=None, **kw):
     """
     This is the default editDocument method. This method
     can easily be overwritten.
     """
-    object._v_inhibit_workflow = True
-    try:
-      object._edit(**kw)
-    finally:
-      object._v_inhibit_workflow = False
+    object._edit(**kw)
 
   security.declareProtected(Permissions.ModifyPortalContent, 'getProperty')
   def getProperty(self, object, kw):

product/ERP5Type/Base.py

@@ -174,16 +174,6 @@ class WorkflowMethod(Method):
       # XXX I must think that what is a correct behavior.(Yusei)
       return self._m(instance, *args, **kw)
 
-    # XXX Ugly hack to avoid calling interaction workflow when synchronizing
-    # objects with ERP5SyncML as it leads to unwanted side-effects on the
-    # object being synchronized, such as undesirable workflow history being
-    # added (for example edit_workflow) and double conversion for OOo
-    # documents (for example document_conversion_interaction_workflow defined
-    # for _setData()) making the source and destination XML representation
-    # different.
-    if getattr(instance, '_v_inhibit_workflow', False):
-      return apply(self.__dict__['_m'], (instance,) + args, kw)
-
     # Build a list of transitions which may need to be invoked
     instance_path = instance.getPhysicalPath()
     portal_type = instance.portal_type