diff --git a/product/ERP5/Document/AgentPrivilege.py b/product/ERP5/Document/AgentPrivilege.py
index dd331a8bca42967244147180d06fc05e49d11206..9c42ef0d4e18b4143a7ac946781d0fadca35eb5e 100644
--- a/product/ERP5/Document/AgentPrivilege.py
+++ b/product/ERP5/Document/AgentPrivilege.py
@@ -28,7 +28,6 @@
 
 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore.WorkflowCore import WorkflowMethod
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5Type.XMLObject import XMLObject
 
diff --git a/product/ERP5/Document/Alarm.py b/product/ERP5/Document/Alarm.py
index a8c5993668e3944e4e3275c0da606a2bd6787800..91ada0070b147961c217135238a5dfb5a11511d3 100644
--- a/product/ERP5/Document/Alarm.py
+++ b/product/ERP5/Document/Alarm.py
@@ -30,7 +30,7 @@ from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5Type.XMLObject import XMLObject
-from Products.CMFCore.WorkflowCore import WorkflowMethod
+from Products.ERP5Type.Base import WorkflowMethod
 from Acquisition import aq_base, aq_parent, aq_inner, aq_acquire
 from Products.CMFCore.utils import getToolByName
 from DateTime import DateTime
diff --git a/product/ERP5/Document/BusinessTemplate.py b/product/ERP5/Document/BusinessTemplate.py
index 286d66ee14b234d1ebfbd779d43c20feffca1986..ae707b3387b03de58d69db1ac788d50510815ad0 100644
--- a/product/ERP5/Document/BusinessTemplate.py
+++ b/product/ERP5/Document/BusinessTemplate.py
@@ -32,7 +32,7 @@ from Acquisition import Implicit, aq_base
 from AccessControl.Permission import Permission
 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore.WorkflowCore import WorkflowMethod
+from Products.ERP5Type.Base import WorkflowMethod
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5Type.Utils import readLocalDocument, \
                                     writeLocalDocument, \
diff --git a/product/ERP5/Document/Delivery.py b/product/ERP5/Document/Delivery.py
index d23b83f510362f0934e88cfaaf633059cf037b88..020b6583e5eb6bb49a81fe12e95cf9ccd0ffd3c9 100644
--- a/product/ERP5/Document/Delivery.py
+++ b/product/ERP5/Document/Delivery.py
@@ -28,7 +28,7 @@
 ##############################################################################
 
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore.WorkflowCore import WorkflowMethod
+from Products.ERP5Type.Base import WorkflowMethod
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5Type.XMLObject import XMLObject
diff --git a/product/ERP5/Document/ImmobilisableItem.py b/product/ERP5/Document/ImmobilisableItem.py
index ec3fe8841887c05b730aaf1ca9e0fe527e6b4cf5..4d821c41c91fe951a77bf7c13b71af2977874543 100644
--- a/product/ERP5/Document/ImmobilisableItem.py
+++ b/product/ERP5/Document/ImmobilisableItem.py
@@ -40,7 +40,6 @@ from Products.ERP5Type.DateUtils import getMonthFraction, getYearFraction, getBi
 from Products.ERP5Type.DateUtils import same_movement_interval, number_of_months_in_year, centis, millis
 from Products.ERP5Type.DateUtils import getAccountableYearFraction, roundDate
 from Products.ERP5.Document.Amount import Amount
-from Products.CMFCore.WorkflowCore import WorkflowMethod
 from Products.CMFCore.utils import getToolByName
 from Products.PythonScripts.Utility import allow_class
 from Products.ERP5.Document.ImmobilisationMovement import UNIMMOBILISING_METHOD, NO_CHANGE_METHOD, AMORTISATION_METHOD_PREFIX
diff --git a/product/ERP5/Document/Immobilisation.py b/product/ERP5/Document/Immobilisation.py
index 429914e46763dff3869a0d7e0b57bfd1cb4faeab..0f3df0a0c394b4ad37f0dd3c081100aa1ac88878 100644
--- a/product/ERP5/Document/Immobilisation.py
+++ b/product/ERP5/Document/Immobilisation.py
@@ -31,7 +31,6 @@ from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, Interface
 #from Products.ERP5.Core import MetaNode, MetaResource
-from Products.CMFCore.WorkflowCore import WorkflowMethod
 
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5.Document.Amount import Amount
diff --git a/product/ERP5/Document/ImmobilisationCell.py b/product/ERP5/Document/ImmobilisationCell.py
index 154c8720043e21e0d64abae0ce80395105f73d97..357ca5d23c51e1ac2d7f8bb5c92bcb93bf18c698 100644
--- a/product/ERP5/Document/ImmobilisationCell.py
+++ b/product/ERP5/Document/ImmobilisationCell.py
@@ -31,7 +31,6 @@ from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, Interface
 #from Products.ERP5.Core import MetaNode, MetaResource
-from Products.CMFCore.WorkflowCore import WorkflowMethod
 
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5.Document.Amount import Amount
diff --git a/product/ERP5/Document/ImmobilisationDelivery.py b/product/ERP5/Document/ImmobilisationDelivery.py
index be68082b1602bc6a96f54bc7e550116214eb71fd..811f86cf78f685a235bd79bf8c0fd79a80cb4fcf 100644
--- a/product/ERP5/Document/ImmobilisationDelivery.py
+++ b/product/ERP5/Document/ImmobilisationDelivery.py
@@ -39,7 +39,7 @@ from Products.ERP5Type.DateUtils import getMonthAndDaysBetween, getRoundedMonthB
 from Products.ERP5Type.DateUtils import getMonthFraction, getYearFraction, getBissextilCompliantYearFraction
 from Products.ERP5Type.DateUtils import same_movement_interval, number_of_months_in_year, centis, millis
 from Products.ERP5.Document.Amount import Amount
-from Products.CMFCore.WorkflowCore import WorkflowMethod
+from Products.ERP5Type.Base import WorkflowMethod
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5.Document.ImmobilisableItem import ImmobilisationValidityError
 
diff --git a/product/ERP5/Document/ImmobilisationLine.py b/product/ERP5/Document/ImmobilisationLine.py
index b54dd52fd0356afcc7897a58088b34c8cad0eafa..14c5ed7e71a9b67edfaeb1e4def4c3a842e65020 100644
--- a/product/ERP5/Document/ImmobilisationLine.py
+++ b/product/ERP5/Document/ImmobilisationLine.py
@@ -31,7 +31,6 @@ from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, Interface
 #from Products.ERP5.Core import MetaNode, MetaResource
-from Products.CMFCore.WorkflowCore import WorkflowMethod
 
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5.Document.Amount import Amount
diff --git a/product/ERP5/Document/ImmobilisationMovement.py b/product/ERP5/Document/ImmobilisationMovement.py
index 67b7fcd372edd063f7de2728a71094da1e75fe08..a2807152584b6be6182cb8f0c7da1a01d364d1ef 100644
--- a/product/ERP5/Document/ImmobilisationMovement.py
+++ b/product/ERP5/Document/ImmobilisationMovement.py
@@ -30,7 +30,6 @@ from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Base, Permissions, PropertySheet, Constraint, Interface
-from Products.CMFCore.WorkflowCore import WorkflowMethod
 
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5.Document.Amount import Amount
diff --git a/product/ERP5/Document/Item.py b/product/ERP5/Document/Item.py
index c7b7c87c474ec996aab18134516980d121c996a3..4e9755c10cea2efe8b49370926d0d9919599b422 100644
--- a/product/ERP5/Document/Item.py
+++ b/product/ERP5/Document/Item.py
@@ -40,7 +40,6 @@ from Products.ERP5Type.DateUtils import getMonthAndDaysBetween, getRoundedMonthB
 from Products.ERP5Type.DateUtils import getMonthFraction, getYearFraction, getBissextilCompliantYearFraction
 from Products.ERP5Type.DateUtils import same_movement_interval, number_of_months_in_year, centis, millis
 from Products.ERP5.Document.Amount import Amount
-from Products.CMFCore.WorkflowCore import WorkflowMethod
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5.Document.ImmobilisableItem import ImmobilisableItem
 
diff --git a/product/ERP5Shop/Document/ShopOrder.py b/product/ERP5Shop/Document/ShopOrder.py
index fb83966f7d5363309954b9c5fe67acb4dffb2603..e7ce51ac2cb4163824547d9c167099983e434d9b 100755
--- a/product/ERP5Shop/Document/ShopOrder.py
+++ b/product/ERP5Shop/Document/ShopOrder.py
@@ -45,7 +45,7 @@ from Products.MMMShop.ShopOrder import ShopOrder as MMMShopOrder
 from Products.MMMShop.ShopOrder import OrderLine as MMMOrderLine
 from Products.MMMShop.utils import getUniqueID
 
-from Products.CMFCore.WorkflowCore import WorkflowMethod
+from Products.ERP5Type.Base import WorkflowMethod
 
 from cStringIO import StringIO