ZODB Components: erp5_core: Migrate SimulationTool, AppliedRule and Simulation...

ZODB Components: erp5_core: Migrate SimulationTool, AppliedRule and Simulation Movement (and their Interfaces/Mixins) (MRs !1093, !1111).

bt5/erp5_accounting/DocumentTemplateItem/portal_components/document.erp5.AccountingTransactionRootSimulationRule.py

@@ -28,8 +28,8 @@
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 
-from Products.ERP5.mixin.rule import RuleMixin
-from Products.ERP5.mixin.movement_collection_updater import MovementCollectionUpdaterMixin
+from erp5.component.mixin.RuleMixin import RuleMixin
+from erp5.component.mixin.MovementCollectionUpdaterMixin import MovementCollectionUpdaterMixin
 class AccountingTransactionRootSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   """
   Accounting Transaction Root Simulation Rule is a root level rule for

bt5/erp5_accounting/DocumentTemplateItem/portal_components/document.erp5.PaymentSimulationRule.py

@@ -28,11 +28,13 @@
 
 import zope.interface
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.mixin.rule import RuleMixin
+from Products.ERP5Type import Permissions, PropertySheet
+from erp5.component.mixin.RuleMixin import RuleMixin
 from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
-from Products.ERP5.mixin.movement_collection_updater import \
-     MovementCollectionUpdaterMixin
+from erp5.component.mixin.MovementCollectionUpdaterMixin import MovementCollectionUpdaterMixin
+from erp5.component.interface.IRule import IRule
+from erp5.component.interface.IDivergenceController import IDivergenceController
+from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
 
 class PaymentSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   """
@@ -48,9 +50,9 @@ class PaymentSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IRule,
-                            interfaces.IDivergenceController,
-                            interfaces.IMovementCollectionUpdater,)
+  zope.interface.implements(IRule,
+                            IDivergenceController,
+                            IMovementCollectionUpdater,)
 
   # Default Properties
   property_sheets = (

bt5/erp5_base/MixinTemplateItem/portal_components/mixin.erp5.BuilderMixin.py

@@ -33,7 +33,7 @@ from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.Document.Amount import Amount
-from Products.ERP5.MovementGroup import MovementGroupNode
+from erp5.component.module.MovementGroup import MovementGroupNode
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
 from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod
 from Products.ERP5.ExplanationCache import _getExplanationCache

bt5/erp5_commerce_loyalty_program/DocumentTemplateItem/portal_components/document.erp5.LoyaltyTransactionSimulationRule.py

@@ -29,12 +29,15 @@
 
 import zope.interface
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.mixin.rule import RuleMixin
+from Products.ERP5Type import Permissions, PropertySheet
+from erp5.component.mixin.RuleMixin import RuleMixin
 from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
-from Products.ERP5.mixin.movement_collection_updater import \
+from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
 from Acquisition import aq_base
+from erp5.component.interface.IRule import IRule
+from erp5.component.interface.IDivergenceController import IDivergenceController
+from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
 
 class LoyaltyTransactionSimulationRule(RuleMixin,MovementCollectionUpdaterMixin):
   """  """
@@ -47,9 +50,9 @@ class LoyaltyTransactionSimulationRule(RuleMixin,MovementCollectionUpdaterMixin)
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IRule,
-                            interfaces.IDivergenceController,
-                            interfaces.IMovementCollectionUpdater,)
+  zope.interface.implements(IRule,
+                            IDivergenceController,
+                            IMovementCollectionUpdater,)
 
   # Default Properties
   property_sheets = (

bt5/erp5_immobilisation/DocumentTemplateItem/portal_components/document.erp5.AmortisationRule.py

@@ -33,7 +33,7 @@ from string import capitalize
 from Products.ERP5Type.DateUtils import centis, getClosestDate, addToDate
 from Products.ERP5Type.DateUtils import getDecimalNumberOfYearsBetween
 from Products.ERP5Type import Permissions
-from Products.ERP5.mixin.rule import RuleMixin
+from erp5.component.mixin.RuleMixin import RuleMixin
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5.Document.ImmobilisationMovement import NO_CHANGE_METHOD
 

bt5/erp5_invoicing/DocumentTemplateItem/portal_components/document.erp5.InvoiceSimulationRule.py

@@ -28,11 +28,14 @@
 
 import zope.interface
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.mixin.rule import RuleMixin
+from Products.ERP5Type import Permissions, PropertySheet
+from erp5.component.mixin.RuleMixin import RuleMixin
 from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
-from Products.ERP5.mixin.movement_collection_updater import \
+from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
+from erp5.component.interface.IRule import IRule
+from erp5.component.interface.IDivergenceController import IDivergenceController
+from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
 
 class InvoiceSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   """
@@ -47,9 +50,9 @@ class InvoiceSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IRule,
-                            interfaces.IDivergenceController,
-                            interfaces.IMovementCollectionUpdater,)
+  zope.interface.implements(IRule,
+                            IDivergenceController,
+                            IMovementCollectionUpdater,)
 
   # Default Properties
   property_sheets = (

bt5/erp5_invoicing/DocumentTemplateItem/portal_components/document.erp5.InvoiceTransactionSimulationRule.py

@@ -28,13 +28,15 @@
 
 import zope.interface
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.mixin.rule import RuleMixin
+from Products.ERP5Type import Permissions, PropertySheet
+from erp5.component.mixin.RuleMixin import RuleMixin
 from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
-from Products.ERP5.mixin.movement_collection_updater import \
+from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
 from Products.ERP5.Document.PredicateMatrix import PredicateMatrix
-
+from erp5.component.interface.IRule import IRule
+from erp5.component.interface.IDivergenceController import IDivergenceController
+from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
 
 class InvoiceTransactionSimulationRule(RuleMixin,
     MovementCollectionUpdaterMixin, PredicateMatrix):
@@ -53,9 +55,9 @@ class InvoiceTransactionSimulationRule(RuleMixin,
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IRule,
-                            interfaces.IDivergenceController,
-                            interfaces.IMovementCollectionUpdater,)
+  zope.interface.implements(IRule,
+                            IDivergenceController,
+                            IMovementCollectionUpdater,)
 
   # Default Properties
   property_sheets = (

bt5/erp5_invoicing/DocumentTemplateItem/portal_components/document.erp5.TradeModelSimulationRule.py

@@ -29,11 +29,14 @@
 import zope.interface
 from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.mixin.rule import RuleMixin
+from Products.ERP5Type import Permissions, PropertySheet
+from erp5.component.mixin.RuleMixin import RuleMixin
 from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
-from Products.ERP5.mixin.movement_collection_updater import \
+from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
+from erp5.component.interface.IRule import IRule
+from erp5.component.interface.IDivergenceController import IDivergenceController
+from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
 
 class TradeModelSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   """
@@ -48,9 +51,9 @@ class TradeModelSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IRule,
-                            interfaces.IDivergenceController,
-                            interfaces.IMovementCollectionUpdater,)
+  zope.interface.implements(IRule,
+                            IDivergenceController,
+                            IMovementCollectionUpdater,)
 
   # Default Properties
   property_sheets = (

bt5/erp5_mrp/DocumentTemplateItem/portal_components/document.erp5.TransformationSimulationRule.py

@@ -30,9 +30,9 @@ from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
-from Products.ERP5.mixin.rule import RuleMixin
+from erp5.component.mixin.RuleMixin import RuleMixin
 from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
-from Products.ERP5.mixin.movement_collection_updater import \
+from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
 
 class TransformationSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):

bt5/erp5_mrp/DocumentTemplateItem/portal_components/document.erp5.TransformationSourcingSimulationRule.py

@@ -29,9 +29,9 @@
 from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5.mixin.rule import RuleMixin
+from erp5.component.mixin.RuleMixin import RuleMixin
 from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
-from Products.ERP5.mixin.movement_collection_updater import \
+from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
 
 class TransformationSourcingSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):

bt5/erp5_real_time_inventory_accounting/DocumentTemplateItem/portal_components/document.erp5.InventoryAssetPriceAccountingSimulationRule.py

@@ -36,7 +36,7 @@ class InventoryAssetPriceAccountingRuleMovementGenerator(InvoiceTransactionRuleM
   meta_type = 'ERP5 Inventory Asset Price Accounting Simulation Rule'
   portal_type = 'Inventory Asset Price Accounting Simulation Rule'
 
-  # XXX: Copy/paste from Products.ERP5.mixin.rule to support Transit use case
+  # XXX: Copy/paste from erp5.component.mixin.RuleMixin to support Transit use case
   def getGeneratedMovementList(self, movement_list=None, rounding=False):
     """
     Returns a list of movements generated by that rule.

bt5/erp5_simulation/DocumentTemplateItem/portal_components/document.erp5.ItemListSplitSolver.py

@@ -34,7 +34,7 @@ from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.XMLObject import XMLObject
 from erp5.component.mixin.SolverMixin import SolverMixin
 from erp5.component.mixin.ConfigurableMixin import ConfigurableMixin
-from Products.ERP5.MovementCollectionDiff import _getPropertyAndCategoryList
+from erp5.component.module.MovementCollectionDiff import _getPropertyAndCategoryList
 from erp5.component.interface.ISolver import ISolver
 from erp5.component.interface.IConfigurable import IConfigurable
 

bt5/erp5_simulation/DocumentTemplateItem/portal_components/document.erp5.QuantitySplitSolver.py

@@ -35,7 +35,7 @@ from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.Globals import PersistentMapping
 from erp5.component.mixin.SolverMixin import SolverMixin
 from erp5.component.mixin.ConfigurableMixin import ConfigurableMixin
-from Products.ERP5.MovementCollectionDiff import _getPropertyAndCategoryList
+from erp5.component.module.MovementCollectionDiff import _getPropertyAndCategoryList
 from erp5.component.interface.ISolver import ISolver
 from erp5.component.interface.IConfigurable import IConfigurable
 

bt5/erp5_simulation/MixinTemplateItem/portal_components/mixin.erp5.EquivalenceTesterMixin.py

@@ -30,7 +30,7 @@ import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.Globals import InitializeClass
 from Products.ERP5Type import Permissions
-from Products.ERP5Type.DivergenceMessage import DivergenceMessage
+from erp5.component.module.DivergenceMessage import DivergenceMessage
 from Products.ERP5Type.Message import Message
 from Products.PythonScripts.standard import html_quote as h
 from zLOG import LOG, WARNING

bt5/erp5_simulation/ToolComponentTemplateItem/portal_components/tool.erp5.SolverProcessTool.py

@@ -31,10 +31,11 @@ import zope.interface
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.Globals import InitializeClass
-from Products.ERP5Type import Permissions, interfaces
+from Products.ERP5Type import Permissions
 from Products.ERP5Type.Tool.BaseTool import BaseTool
 
 from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod
+from erp5.component.interface.IDivergenceController import IDivergenceController
 
 class SolverProcessTool(BaseTool):
   """ Container for solver processes.
@@ -48,7 +49,7 @@ class SolverProcessTool(BaseTool):
   security = ClassSecurityInfo()
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IDivergenceController, )
+  zope.interface.implements(IDivergenceController, )
 
   # IDivergenceController implementation
   security.declareProtected(Permissions.AccessContentsInformation,

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.BusinessProcess.py

@@ -35,7 +35,7 @@ from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5.Document.Path import Path
 from Products.ERP5.ExplanationCache import _getExplanationCache, _getBusinessLinkClosure
-from Products.ERP5.MovementCollectionDiff import _getPropertyAndCategoryList
+from erp5.component.module.MovementCollectionDiff import _getPropertyAndCategoryList
 from erp5.component.interface.IBusinessProcess import IBusinessProcess
 
 import zope.interface

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.DeliveryRootSimulationRule.py

@@ -28,11 +28,14 @@
 
 import zope.interface
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.mixin.rule import RuleMixin
+from Products.ERP5Type import Permissions, PropertySheet
+from erp5.component.mixin.RuleMixin import RuleMixin
 from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
-from Products.ERP5.mixin.movement_collection_updater import \
+from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
+from erp5.component.interface.IRule import IRule
+from erp5.component.interface.IDivergenceController import IDivergenceController
+from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
 
 class DeliveryRootSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   """
@@ -50,9 +53,9 @@ class DeliveryRootSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IRule,
-                            interfaces.IDivergenceController,
-                            interfaces.IMovementCollectionUpdater,)
+  zope.interface.implements(IRule,
+                            IDivergenceController,
+                            IMovementCollectionUpdater,)
 
   # Default Properties
   property_sheets = (

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.DeliverySimulationRule.py

@@ -28,11 +28,14 @@
 
 import zope.interface
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.mixin.rule import RuleMixin
+from Products.ERP5Type import Permissions, PropertySheet
+from erp5.component.mixin.RuleMixin import RuleMixin
 from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
-from Products.ERP5.mixin.movement_collection_updater import \
+from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
+from erp5.component.interface.IRule import IRule
+from erp5.component.interface.IDivergenceController import IDivergenceController
+from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
 
 class DeliverySimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   """
@@ -50,9 +53,9 @@ class DeliverySimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IRule,
-                            interfaces.IDivergenceController,
-                            interfaces.IMovementCollectionUpdater,)
+  zope.interface.implements(IRule,
+                            IDivergenceController,
+                            IMovementCollectionUpdater,)
 
   # Default Properties
   property_sheets = (

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.OrderRootSimulationRule.py

@@ -28,11 +28,14 @@
 
 import zope.interface
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.mixin.rule import RuleMixin
+from Products.ERP5Type import Permissions, PropertySheet
+from erp5.component.mixin.RuleMixin import RuleMixin
 from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
-from Products.ERP5.mixin.movement_collection_updater import \
+from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
+from erp5.component.interface.IRule import IRule
+from erp5.component.interface.IDivergenceController import IDivergenceController
+from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
 
 class OrderRootSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   """
@@ -50,9 +53,9 @@ class OrderRootSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IRule,
-                            interfaces.IDivergenceController,
-                            interfaces.IMovementCollectionUpdater,)
+  zope.interface.implements(IRule,
+                            IDivergenceController,
+                            IMovementCollectionUpdater,)
 
   # Default Properties
   property_sheets = (

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.TradeCondition.py

@@ -40,6 +40,7 @@ from Products.ERP5.mixin.composition import _getEffectiveModel
 from Products.ERP5.Document.MappedValue import MappedValue
 from Products.ERP5.mixin.amount_generator import AmountGeneratorMixin
 from Products.ERP5.mixin.variated import VariatedMixin
+from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
 
 class TradeCondition(MappedValue, AmountGeneratorMixin, VariatedMixin):
   """
@@ -74,7 +75,7 @@ class TradeCondition(MappedValue, AmountGeneratorMixin, VariatedMixin):
 
   zope.interface.implements(interfaces.IAmountGenerator,
                             interfaces.IMovementGenerator,
-                            interfaces.IMovementCollectionUpdater,)
+                            IMovementCollectionUpdater,)
 
 
   # Mapped Value implementation

product/ERP5/TargetSolver/SplitAndDefer.py

@@ -27,7 +27,6 @@
 #
 ##############################################################################
 
-from Products.ERP5.MovementCollectionDiff import _getPropertyAndCategoryList
 from Products.ERP5Type.Globals import PersistentMapping
 from CopyToTarget import CopyToTarget
 from Acquisition import aq_base
@@ -64,6 +63,7 @@ class SplitAndDefer(CopyToTarget):
         split_index += 1
         new_id = "%s_split_%s" % (simulation_movement.getId(), split_index)
       # Adopt different dates for deferred movements
+      from erp5.component.module.MovementCollectionDiff import _getPropertyAndCategoryList
       movement_dict = _getPropertyAndCategoryList(simulation_movement)
       # new properties
       movement_dict.update(

product/ERP5/__init__.py

@@ -35,17 +35,13 @@ from Products.ERP5Type.Utils import initializeProduct, updateGlobals
 import sys, Permissions
 this_module = sys.modules[ __name__ ]
 document_classes = updateGlobals( this_module, globals(), permissions_module = Permissions)
-from Products.PythonScripts.Utility import allow_class
 from AccessControl import ModuleSecurityInfo
 
-import MovementGroup
-allow_class(MovementGroup)
-
 from Products.ERP5Type.Globals import package_home
 product_path = package_home( globals() )
 
 # Define object classes and tools
-from Tool import CategoryTool, SimulationTool, RuleTool, IdTool, TemplateTool,\
+from Tool import CategoryTool, RuleTool, IdTool, TemplateTool,\
                  TestTool, DomainTool, AlarmTool, OrderTool, DeliveryTool,\
                  TrashTool, ContributionTool, NotificationTool, PasswordTool,\
                  GadgetTool, ContributionRegistryTool, IntrospectionTool,\
@@ -59,7 +55,6 @@ object_classes = ( ERP5Site.ERP5Site,
                    SQLMethod.SQLMethod,
                  )
 portal_tools = ( CategoryTool.CategoryTool,
-                 SimulationTool.SimulationTool,
                  RuleTool.RuleTool,
                  IdTool.IdTool,
                  TemplateTool.TemplateTool,

product/ERP5/Document/AppliedRule.py → product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.AppliedRule.py

@@ -34,15 +34,17 @@ import zope.interface
 from zExceptions import ExceptionFormatter
 from ZODB.POSException import ConflictError
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
+from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
 from Products.ERP5Type.Base import WorkflowMethod
 from Products.ERP5Type.Globals import PersistentMapping
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
-from Products.ERP5.ExpandPolicy import TREE_DELIVERED_CACHE_KEY
-from Products.ERP5.mixin.explainable import ExplainableMixin
-from Products.ERP5.mixin.rule import RuleMixin
+from erp5.component.module.ExpandPolicy import TREE_DELIVERED_CACHE_KEY
+from erp5.component.mixin.ExplainableMixin import ExplainableMixin
+from erp5.component.mixin.RuleMixin import RuleMixin
+from erp5.component.interface.IExpandable import IExpandable
+from erp5.component.interface.IMovementCollection import IMovementCollection
 
 class AppliedRule(XMLObject, ExplainableMixin):
   """
@@ -80,8 +82,8 @@ class AppliedRule(XMLObject, ExplainableMixin):
                     )
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IExpandable,
-                            interfaces.IMovementCollection)
+  zope.interface.implements(IExpandable,
+                            IMovementCollection)
 
   def tpValues(self) :
     """ show the content in the left pane of the ZMI """
@@ -170,6 +172,7 @@ class AppliedRule(XMLObject, ExplainableMixin):
     """
     return self.objectValues(portal_type=RuleMixin.movement_type)
 
+  # pylint: disable=cell-var-from-loop
   def _migrateSimulationTree(self,
                              get_matching_key,
                              get_original_property_dict,
@@ -370,8 +373,8 @@ class AppliedRule(XMLObject, ExplainableMixin):
       for delivery, sm_dict in deleted:
         if not sm_dict:
           del old_dict[delivery]
-      from Products.ERP5.Document.SimulationMovement import SimulationMovement
-      from Products.ERP5.mixin.movement_collection_updater import \
+      from erp5.component.document.SimulationMovement import SimulationMovement
+      from erp5.component.mixin.MovementCollectionUpdaterMixin import \
           MovementCollectionUpdaterMixin as mixin
       # Patch is already protected by WorkflowMethod.disable lock.
       orig_updateMovementCollection = mixin.__dict__['updateMovementCollection']
@@ -404,8 +407,8 @@ class AppliedRule(XMLObject, ExplainableMixin):
         document = object_list.popleft()
         portal_type = document.getPortalType()
         document_dict = {'portal_type': portal_type}
-        for property in property_dict[portal_type]:
-          document_dict[property] = document.getProperty(property)
+        for property_ in property_dict[portal_type]:
+          document_dict[property_] = document.getProperty(property_)
         rule_dict[document.getRelativeUrl()] = document_dict
         object_list += document.objectValues()
       return rule_dict

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.AppliedRule.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>AppliedRule</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.AppliedRule</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.AppliedRule</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Delivery.py

@@ -44,6 +44,8 @@ from Products.ERP5.mixin.composition import CompositionMixin
 from erp5.component.mixin.SimulableMixin import SimulableMixin
 from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod, \
     unrestricted_apply
+from erp5.component.interface.IMovementCollection import IMovementCollection
+from erp5.component.interface.IDivergenceController import IDivergenceController
 
 class Delivery(XMLObject, ImmobilisationDelivery, SimulableMixin,
                CompositionMixin, AmountGeneratorMixin):
@@ -75,8 +77,8 @@ class Delivery(XMLObject, ImmobilisationDelivery, SimulableMixin,
 
   # Declarative interfaces
   zope.interface.implements(interfaces.IAmountGenerator,
-                            interfaces.IDivergenceController,
-                            interfaces.IMovementCollection)
+                            IDivergenceController,
+                            IMovementCollection)
 
   security.declareProtected(Permissions.AccessContentsInformation, 'isAccountable')
   def isAccountable(self):

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.DeliveryCell.py

@@ -33,11 +33,12 @@ import zope.interface
 from AccessControl import ClassSecurityInfo
 from AccessControl.PermissionRole import PermissionRole
 
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
+from Products.ERP5Type import Permissions, PropertySheet
 
 from Products.ERP5.Document.Movement import Movement
 from Products.ERP5.Document.MappedValue import MappedValue
 from Products.ERP5.Document.ImmobilisationMovement import ImmobilisationMovement
+from erp5.component.interface.IDivergenceController import IDivergenceController
 
 class DeliveryCell(MappedValue, Movement, ImmobilisationMovement):
   """
@@ -66,7 +67,7 @@ class DeliveryCell(MappedValue, Movement, ImmobilisationMovement):
                     )
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IDivergenceController,)
+  zope.interface.implements(IDivergenceController,)
 
   security.declareProtected(Permissions.AccessContentsInformation, 'isPredicate')
   def isPredicate(self):

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.DeliveryLine.py

@@ -30,7 +30,7 @@
 import zope.interface
 from AccessControl import ClassSecurityInfo
 
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
+from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 
 from Products.ERP5.Document.Movement import Movement
@@ -40,6 +40,8 @@ from inspect import getargspec
 from Products.ERP5Type.Base import Base
 edit_args_list = getargspec(Base._edit).args
 
+from erp5.component.interface.IDivergenceController import IDivergenceController
+
 class DeliveryLine(Movement, XMLMatrix, ImmobilisationMovement):
   """
   A DeliveryLine object allows to implement lines in
@@ -70,7 +72,7 @@ class DeliveryLine(Movement, XMLMatrix, ImmobilisationMovement):
                     )
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IDivergenceController,)
+  zope.interface.implements(IDivergenceController,)
 
   # Multiple inheritance definition
   updateRelatedContent = XMLMatrix.updateRelatedContent

product/ERP5/Document/SimulationMovement.py → product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.SimulationMovement.py

@@ -33,12 +33,13 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
 from Products.ERP5.Document.Movement import Movement
-from Products.ERP5.ExpandPolicy import policy_dict, TREE_DELIVERED_CACHE_KEY
+from erp5.component.module.ExpandPolicy import policy_dict, TREE_DELIVERED_CACHE_KEY
 
 from zLOG import LOG, WARNING
 
 from Products.ERP5.mixin.property_recordable import PropertyRecordableMixin
-from Products.ERP5.mixin.explainable import ExplainableMixin
+from erp5.component.mixin.ExplainableMixin import ExplainableMixin
+from erp5.component.interface.IExpandable import IExpandable
 
 # XXX Do we need to create groups ? (ie. confirm group include confirmed, getting_ready and ready
 
@@ -118,7 +119,7 @@ class SimulationMovement(PropertyRecordableMixin, Movement, ExplainableMixin):
                     )
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IExpandable,
+  zope.interface.implements(IExpandable,
                             interfaces.IPropertyRecordable)
 
   def tpValues(self) :
@@ -656,25 +657,25 @@ class SimulationMovement(PropertyRecordableMixin, Movement, ExplainableMixin):
       empty; a movement is only yielded if its causality value is in this set
       """
       object_id_list = document.objectIds()
-      for id in object_id_list:
-        if id not in tree_node.visited_movement_dict:
+      for id_ in object_id_list:
+        if id_ not in tree_node.visited_movement_dict:
           # we had not visited it in step #2
-          subdocument = document._getOb(id)
+          subdocument = document._getOb(id_)
           if subdocument.getPortalType() == "Simulation Movement":
             path = subdocument.getCausalityValue(portal_type='Business Link')
             t = (subdocument, path)
-            tree_node.visited_movement_dict[id] = t
+            tree_node.visited_movement_dict[id_] = t
             if path in path_set_to_check:
               yield t
           else:
             # it must be an Applied Rule
-            subtree = tree_node.get(id, treeNode())
+            subtree = tree_node.get(id_, treeNode())
             for d in descendantGenerator(subdocument,
                                          subtree,
                                          path_set_to_check):
               yield d
 
-      for id, t in tree_node.visited_movement_dict.iteritems():
+      for id_, t in tree_node.visited_movement_dict.iteritems():
         subdocument, path = t
         to_check = path_set_to_check
         # do we need to change/copy the set?
@@ -684,7 +685,7 @@ class SimulationMovement(PropertyRecordableMixin, Movement, ExplainableMixin):
             continue
           to_check = to_check.copy()
           to_check.remove(path)
-        subtree = tree_node.get(id, treeNode())
+        subtree = tree_node.get(id_, treeNode())
         for d in descendantGenerator(subdocument, subtree, to_check):
           yield d
 

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.SimulationMovement.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>SimulationMovement</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.SimulationMovement</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.SimulationMovement</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IDivergenceController.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Interface Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>IDivergenceController</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.divergence_controller</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IDivergenceController</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Interface Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/interfaces/expandable.py → product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IExpandable.py

@@ -26,7 +26,7 @@
 #
 ##############################################################################
 """
-Products.ERP5.interfaces.expandable
+erp5.component.interface.IExpandable
 """
 from zope.interface import Interface
 

product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IExpandable.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Interface Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>IExpandable</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.expandable</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IExpandable</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Interface Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IMovementCollection.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Interface Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>IMovementCollection</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.movement_collection</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IMovementCollection</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Interface Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IMovementCollectionDiff.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Interface Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>IMovementCollectionDiff</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.movement_collection_diff</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IMovementCollectionDiff</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Interface Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IMovementCollectionUpdater.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Interface Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>IMovementCollectionUpdater</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.movement_collection_updater</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IMovementCollectionUpdater</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Interface Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/interfaces/rule.py → product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IRule.py

@@ -27,9 +27,9 @@
 #
 ##############################################################################
 """
-Products.ERP5.interfaces.rule
+erp5.component.interface.IRule
 """
-from Products.ERP5.interfaces.movement_collection_updater import IMovementCollectionUpdater
+from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
 
 class IRule(IMovementCollectionUpdater):
   """Rule interface specification

product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IRule.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Interface Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>IRule</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.rule</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IRule</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Interface Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/interfaces/simulation_movement.py → product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.ISimulationMovement.py

@@ -27,14 +27,13 @@
 #
 ##############################################################################
 """
-Products.ERP5.interfaces.simulation_movement
+erp5.component.interface.ISimulationMovement
 """
 
 from Products.ERP5.interfaces.property_recordable import IPropertyRecordable
 from Products.ERP5.interfaces.movement import IMovement
-from Products.ERP5.interfaces.divergence_controller import IDivergenceController
+from erp5.component.interface.IDivergenceController import IDivergenceController
 from Products.ERP5.interfaces.explainable import IExplainable
-from zope.interface import Interface
 
 class ISimulationMovement(IMovement, IPropertyRecordable, IDivergenceController, IExplainable):
   """Simulation Movement interface specification

product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.ISimulationMovement.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Interface Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ISimulationMovement</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.simulation_movement</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.ISimulationMovement</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Interface Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.ExplainableMixin.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Mixin Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ExplainableMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.mixin.explainable</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>mixin.erp5.ExplainableMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Mixin Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/mixin/movement_collection_updater.py → product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.MovementCollectionUpdaterMixin.py

@@ -29,10 +29,11 @@
 import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.Globals import InitializeClass
-from Products.ERP5Type import Permissions, interfaces
-from Products.ERP5.MovementCollectionDiff import (
+from Products.ERP5Type import Permissions
+from erp5.component.module.MovementCollectionDiff import (
   MovementCollectionDiff, _getPropertyAndCategoryList)
-from Products.ERP5.mixin.rule import _compare
+from erp5.component.mixin.RuleMixin import _compare
+from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
 
 class MovementCollectionUpdaterMixin:
   """Movement Collection Updater.
@@ -49,7 +50,7 @@ class MovementCollectionUpdaterMixin:
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IMovementCollectionUpdater,)
+  zope.interface.implements(IMovementCollectionUpdater,)
 
   # Implementation of IMovementCollectionUpdater
   security.declareProtected(Permissions.AccessContentsInformation,

product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.MovementCollectionUpdaterMixin.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Mixin Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>MovementCollectionUpdaterMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.mixin.movement_collection_updater</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>mixin.erp5.MovementCollectionUpdaterMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Mixin Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/mixin/rule.py → product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.RuleMixin.py

@@ -29,9 +29,12 @@
 import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.Globals import InitializeClass
-from Products.ERP5Type import Permissions, interfaces
+from Products.ERP5Type import Permissions
 from Products.ERP5Type.Core.Predicate import Predicate
-from Products.ERP5.ExpandPolicy import policy_dict
+from erp5.component.module.ExpandPolicy import policy_dict
+from erp5.component.interface.IRule import IRule
+from erp5.component.interface.IDivergenceController import IDivergenceController
+from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
 
 def _compare(tester_list, prevision_movement, decision_movement):
   for tester in tester_list:
@@ -49,9 +52,9 @@ class RuleMixin(Predicate):
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IRule,
-                            interfaces.IDivergenceController,
-                            interfaces.IMovementCollectionUpdater,)
+  zope.interface.implements(IRule,
+                            IDivergenceController,
+                            IMovementCollectionUpdater,)
 
   # Portal Type of created children
   movement_type = 'Simulation Movement'
@@ -128,7 +131,7 @@ class RuleMixin(Predicate):
   # Implementation of IDivergenceController # XXX-JPS move to IDivergenceController only mixin for
   security.declareProtected( Permissions.AccessContentsInformation,
                             'isDivergent')
-  def isDivergent(self, movement, ignore_list=[]):
+  def isDivergent(self, movement, ignore_list=()):
     """
     Returns true if the Simulation Movement is divergent comparing to
     the delivery value
@@ -179,12 +182,16 @@ class RuleMixin(Predicate):
                          quantity divergence testers
     """
     if exclude_quantity:
-      return filter(lambda x:x.isDivergenceProvider() and \
-                    'quantity' not in x.getTestedPropertyList(), self.objectValues(
-        portal_type=self.getPortalDivergenceTesterTypeList()))
+      return [
+        x for x in self.objectValues(
+          portal_type=self.getPortalDivergenceTesterTypeList())
+        if (x.isDivergenceProvider() and
+            'quantity' not in x.getTestedPropertyList())]
     else:
-      return filter(lambda x:x.isDivergenceProvider(), self.objectValues(
-        portal_type=self.getPortalDivergenceTesterTypeList()))
+      return [
+        x for x in self.objectValues(
+          portal_type=self.getPortalDivergenceTesterTypeList())
+        if x.isDivergenceProvider()]
 
   def _getMatchingTesterList(self):
     """
@@ -192,8 +199,10 @@ class RuleMixin(Predicate):
     be used to match movements and build the diff (ie.
     not all divergence testers of the Rule)
     """
-    return filter(lambda x:x.isMatchingProvider(), self.objectValues(
-      portal_type=self.getPortalDivergenceTesterTypeList()))
+    return [
+      x for x in self.objectValues(
+        portal_type=self.getPortalDivergenceTesterTypeList())
+      if x.isMatchingProvider()]
 
   def _getUpdatingTesterList(self, exclude_quantity=False):
     """
@@ -204,12 +213,16 @@ class RuleMixin(Predicate):
                         quantity divergence testers
     """
     if exclude_quantity:
-      return filter(lambda x:x.isUpdatingProvider() and \
-                    'quantity' not in x.getTestedPropertyList(), self.objectValues(
-        portal_type=self.getPortalDivergenceTesterTypeList()))
+      return [
+        x for x in self.objectValues(
+          portal_type=self.getPortalDivergenceTesterTypeList())
+        if (x.isUpdatingProvider() and
+            'quantity' not in x.getTestedPropertyList())]
     else:
-      return filter(lambda x:x.isUpdatingProvider(), self.objectValues(
-        portal_type=self.getPortalDivergenceTesterTypeList()))
+      return [
+        x for x in self.objectValues(
+          portal_type=self.getPortalDivergenceTesterTypeList())
+        if x.isUpdatingProvider()]
 
   def _getQuantityTesterList(self):
     """

product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.RuleMixin.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Mixin Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>RuleMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.mixin.rule</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>mixin.erp5.RuleMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Mixin Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/ExpandPolicy.py → product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.ExpandPolicy.py

@@ -130,7 +130,7 @@ class VerticalTimeBound(_Policy):
     super(VerticalTimeBound, self).__init__(**kw)
     self.stop = transaction.get().start_time + VERTICAL_EXPAND_TIMEOUT
 
-  def test(self, context):
+  def test(self, context): # pylint: disable=method-hidden
     if time() < self.stop:
       return True
     self.deferAll()

product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.ExpandPolicy.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Module Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ExpandPolicy</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.ExpandPolicy</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>module.erp5.ExpandPolicy</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Module Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/MovementCollectionDiff.py → product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.MovementCollectionDiff.py

@@ -27,8 +27,8 @@
 ##############################################################################
 
 import zope.interface
-from Products.ERP5Type import interfaces
 from Products.ERP5Type.Accessor.TypeDefinition import list_types
+from erp5.component.interface.IMovementCollectionDiff import IMovementCollectionDiff
 
 class MovementCollectionDiff(object):
   """
@@ -39,7 +39,7 @@ class MovementCollectionDiff(object):
   IMovementCollectionUpdater.
   """
   # Declarative interfaces
-  zope.interface.implements(interfaces.IMovementCollectionDiff,)
+  zope.interface.implements(IMovementCollectionDiff,)
 
   def __init__(self):
     self._deletable_movement_list = []

product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.MovementCollectionDiff.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Module Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>MovementCollectionDiff</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.MovementCollectionDiff</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>module.erp5.MovementCollectionDiff</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Module Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/MovementGroup.py → product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.MovementGroup.py

@@ -41,7 +41,7 @@ class MovementGroupNode:
   # a separate method requests separating movements.
   def __init__(self, movement_group_list=None, movement_list=None,
                last_line_movement_group=None,
-               separate_method_name_list=[], movement_group=None,
+               separate_method_name_list=(), movement_group=None,
                merge_delivery=None):
     self._movement_list = []
     self._group_list = []
@@ -332,7 +332,7 @@ class FakeMovement:
         return True
     return False
 
-  def _setDelivery(self, object):
+  def _setDelivery(self, object): # pylint: disable=redefined-builtin
     """
       Set Delivery value for each movement
     """
@@ -508,85 +508,3 @@ class FakeMovement:
                                               id(self),
                                               self.getMovementList())
     return repr_str
\ No newline at end of file
-
-# The following classes are not ported to Document/XxxxMovementGroup.py yet.
-
-class RootMovementGroup(MovementGroupNode):
-  pass
-
-class SplitResourceMovementGroup(RootMovementGroup):
-
-  def __init__(self, movement, **kw):
-    RootMovementGroup.__init__(self, movement=movement, **kw)
-    self.resource = movement.getResource()
-
-  def test(self, movement):
-    return movement.getResource() == self.resource
-
-allow_class(SplitResourceMovementGroup)
-
-class OptionMovementGroup(RootMovementGroup):
-
-  def __init__(self,movement,**kw):
-    RootMovementGroup.__init__(self, movement=movement, **kw)
-    option_base_category_list = movement.getPortalOptionBaseCategoryList()
-    self.option_category_list = movement.getVariationCategoryList(
-                                  base_category_list=option_base_category_list)
-    if self.option_category_list is None:
-      self.option_category_list = []
-    self.option_category_list.sort()
-    # XXX This is very bad, but no choice today.
-    self.setGroupEdit(industrial_phase_list = self.option_category_list)
-
-  def test(self,movement):
-    option_base_category_list = movement.getPortalOptionBaseCategoryList()
-    movement_option_category_list = movement.getVariationCategoryList(
-                              base_category_list=option_base_category_list)
-    if movement_option_category_list is None:
-      movement_option_category_list = []
-    movement_option_category_list.sort()
-    return movement_option_category_list == self.option_category_list
-
-allow_class(OptionMovementGroup)
-
-# XXX This should not be here
-# I (seb) have commited this because movement groups are not
-# yet configurable through the zope web interface
-class IntIndexMovementGroup(RootMovementGroup):
-
-  def getIntIndex(self,movement):
-    order_value = movement.getOrderValue()
-    int_index = 0
-    if order_value is not None:
-      if "Line" in order_value.getPortalType():
-        int_index = order_value.getIntIndex()
-      elif "Cell" in order_value.getPortalType():
-        int_index = order_value.getParentValue().getIntIndex()
-    return int_index
-
-  def __init__(self,movement,**kw):
-    RootMovementGroup.__init__(self, movement=movement, **kw)
-    int_index = self.getIntIndex(movement)
-    self.int_index = int_index
-    self.setGroupEdit(
-        int_index=int_index
-    )
-
-  def test(self,movement):
-    return self.getIntIndex(movement) == self.int_index
-
-allow_class(IntIndexMovementGroup)
-
-class ParentExplanationMovementGroup(RootMovementGroup): pass
-
-class ParentExplanationCausalityMovementGroup(ParentExplanationMovementGroup):
-  """
-  Like ParentExplanationMovementGroup, and set the causality.
-  """
-  def __init__(self, movement, **kw):
-    ParentExplanationMovementGroup.__init__(self, movement=movement, **kw)
-    self.updateGroupEdit(
-        causality_value = self.explanation_value
-    )
-
-allow_class(ParentExplanationCausalityMovementGroup)

product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.MovementGroup.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Module Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>MovementGroup</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.MovementGroup</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>module.erp5.MovementGroup</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Module Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.SimulationTool.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Tool Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>SimulationTool</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Tool.SimulationTool</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>tool.erp5.SimulationTool</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Tool Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/bt/template_document_id_list

+document.erp5.AppliedRule
 document.erp5.Delivery
 document.erp5.DeliveryCell
 document.erp5.DeliveryLine
@@ -10,3 +11,4 @@ document.erp5.Item
 document.erp5.Order
 document.erp5.PackingList
 document.erp5.ScriptConstraint
+document.erp5.SimulationMovement
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/bt/template_interface_id_list

+interface.erp5.IDivergenceController
+interface.erp5.IExpandable
+interface.erp5.IMovementCollection
+interface.erp5.IMovementCollectionDiff
+interface.erp5.IMovementCollectionUpdater
+interface.erp5.IRule
+interface.erp5.ISimulationMovement
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/bt/template_mixin_id_list

+mixin.erp5.ExplainableMixin
+mixin.erp5.MovementCollectionUpdaterMixin
+mixin.erp5.RuleMixin
 mixin.erp5.SimulableMixin
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/bt/template_module_component_id_list

+module.erp5.ExpandPolicy
+module.erp5.MovementCollectionDiff
+module.erp5.MovementGroup
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/bt/template_tool_component_id_list

 tool.erp5.CallableTool
 tool.erp5.DiffTool
+tool.erp5.SimulationTool
\ No newline at end of file

product/ERP5/dtml/explainSimulationTool.dtml

-<dtml-var manage_page_header>
-<dtml-var manage_tabs>
-
-<dtml-var manage_page_footer>

product/ERP5/tests/testInventoryAPI.py

@@ -43,8 +43,6 @@ from MySQLdb import ProgrammingError
 
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from Products.ERP5Type.tests.utils import reindex
-from Products.ERP5.Tool.SimulationTool import MYSQL_MIN_DATETIME_RESOLUTION
-
 
 class InventoryAPITestCase(ERP5TypeTestCase):
   """Base class for Inventory API Tests {{{
@@ -2913,6 +2911,7 @@ class TestInventoryCacheTable(InventoryAPITestCase):
     min_lag = cache_lag / 2
     self.NOW = now = DateTime(DateTime().strftime("%Y-%m-%d %H:%M:%S UTC"))
     self.CACHE_DATE = cache_date = now - min_lag
+    from erp5.component.tool.SimulationTool import MYSQL_MIN_DATETIME_RESOLUTION
     self.LAST_CACHED_MOVEMENT_DATE = last_cached_movement_date = \
       cache_date - MYSQL_MIN_DATETIME_RESOLUTION
     # First movement, won't be into cache

product/ERP5Type/interfaces/divergence_message.py

@@ -27,7 +27,7 @@
 #
 ##############################################################################
 """
-Products.ERP5Type.interfaces.divergence_message
+erp5.component.interface.IDivergenceMessage
 """
 from zope.interface import Interface