ZODB Components: erp5_core: Migrate Movement Document from filesystem.

* Import Movement Document:
  + Event
    + MailMessage
  + Project
  + ImmobilisationMovement
* Imported by IMovement:
  + IAccountingMovement
  + IAmountGenerator
    + AmountGeneratorMixin
    + AmountGeneratorLine
  + IAssetMovement
  + IProductionMovement
* Used by MovementGeneratorMixin:
  + IMovementGenerator
  + IMovementList

Also, define providesI<INTERFACE_NAME>() on Base class for migrated Interfaces as
these needs to be available before bt5 containing the ZODB Component Interfaces are
upgraded (see also c86107bf). Otherwise, testUpgradeInstanceWithOldDataFs fails as
z_catalog_item_list (newActiveProcess() from upgrader) calls providesIMovement().

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

@@ -70,7 +70,7 @@ class AccountingTransactionRootSimulationRule(RuleMixin, MovementCollectionUpdat
     # or destination.
     return (movement.getSource() is None or movement.getDestination() is None)
 
-from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
 class AccountingTransactionRuleMovementGenerator(MovementGeneratorMixin):
 
   def _getPortalDeliveryMovementTypeList(self):

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

@@ -30,7 +30,7 @@ import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from erp5.component.mixin.RuleMixin import RuleMixin
-from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
 from erp5.component.mixin.MovementCollectionUpdaterMixin import MovementCollectionUpdaterMixin
 from erp5.component.interface.IRule import IRule
 from erp5.component.interface.IDivergenceController import IDivergenceController

bt5/erp5_budget/DocumentTemplateItem/portal_components/document.erp5.BudgetCell.py

@@ -32,7 +32,7 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.Document.MetaNode import MetaNode
-from Products.ERP5.Document.Movement import Movement
+from erp5.component.document.Movement import Movement
 
 class BudgetCell(Predicate, MetaNode, Movement):
   """ Budget Cell defines a cell of budget.

bt5/erp5_calendar/DocumentTemplateItem/portal_components/document.erp5.PresencePeriod.py

@@ -35,7 +35,7 @@ from DateTime import DateTime
 
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5.mixin.periodicity import PeriodicityMixin
-from Products.ERP5.Document.Movement import Movement
+from erp5.component.document.Movement import Movement
 from Products.ERP5Type.DateUtils import addToDate
 
 class PresencePeriod(Movement, PeriodicityMixin):

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

@@ -31,7 +31,7 @@ import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from erp5.component.mixin.RuleMixin import RuleMixin
-from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
 from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
 from Acquisition import aq_base

bt5/erp5_crm/DocumentTemplateItem/portal_components/document.erp5.Acknowledgement.py

@@ -31,7 +31,7 @@ from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
 
 from Products.ERP5.Document.EmailDocument import EmailDocumentProxyMixin
-from Products.ERP5.Document.Event import Event
+from erp5.component.document.Event import Event
 
 class Acknowledgement(EmailDocumentProxyMixin, Event):
   """

bt5/erp5_crm/DocumentTemplateItem/portal_components/document.erp5.Ticket.py

@@ -30,7 +30,7 @@ from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
-from Products.ERP5.Document.Project import Project
+from erp5.component.document.Project import Project
 
 class Ticket(Project):
   """

bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyMovement.py

@@ -30,7 +30,7 @@
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.Document.Movement import Movement
+from erp5.component.document.Movement import Movement
 
 
 class DummyMovement(Movement):

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

@@ -35,7 +35,7 @@ from Products.ERP5Type.DateUtils import getDecimalNumberOfYearsBetween
 from Products.ERP5Type import Permissions
 from erp5.component.mixin.RuleMixin import RuleMixin
 from Products.CMFCore.utils import getToolByName
-from Products.ERP5.Document.ImmobilisationMovement import NO_CHANGE_METHOD
+from erp5.component.document.ImmobilisationMovement import NO_CHANGE_METHOD
 
 class AmortisationRule(RuleMixin):
     """

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

@@ -31,8 +31,8 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 
 from Products.ERP5Type.XMLObject import XMLObject
-from Products.ERP5.Document.Movement import Movement
-from Products.ERP5.Document.ImmobilisationMovement import ImmobilisationMovement
+from erp5.component.document.Movement import Movement
+from erp5.component.document.ImmobilisationMovement import ImmobilisationMovement
 from erp5.component.document.DeliveryLine import DeliveryLine
 
 class ImmobilisationLine(Movement, XMLObject, ImmobilisationMovement, DeliveryLine):

bt5/erp5_immobilisation/TestTemplateItem/portal_components/test.erp5.testImmobilisation.py

@@ -34,7 +34,7 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from Products.ERP5Type.tests.Sequence import SequenceList
 from DateTime import DateTime
 from zLOG import LOG
-from Products.ERP5.Document.ImmobilisationMovement import UNIMMOBILISING_METHOD, NO_CHANGE_METHOD
+from erp5.component.document.ImmobilisationMovement import UNIMMOBILISING_METHOD, NO_CHANGE_METHOD
 
 
 class TestImmobilisationMixin(ERP5TypeTestCase):

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

@@ -30,7 +30,7 @@ import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from erp5.component.mixin.RuleMixin import RuleMixin
-from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
 from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
 from erp5.component.interface.IRule import IRule

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

@@ -30,7 +30,7 @@ import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from erp5.component.mixin.RuleMixin import RuleMixin
-from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
 from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
 from Products.ERP5.Document.PredicateMatrix import PredicateMatrix

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

@@ -31,7 +31,7 @@ from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base
 from Products.ERP5Type import Permissions, PropertySheet
 from erp5.component.mixin.RuleMixin import RuleMixin
-from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
 from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
 from erp5.component.interface.IRule import IRule

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

 from erp5.component.document.DeliverySimulationRule import DeliverySimulationRule
-from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
 
 class ProductionSimulationRule(DeliverySimulationRule):
   """

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

@@ -31,7 +31,7 @@ from Acquisition import aq_base
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
 from erp5.component.mixin.RuleMixin import RuleMixin
-from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
 from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
 

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

@@ -30,7 +30,7 @@ from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base
 from Products.ERP5Type import Permissions, PropertySheet
 from erp5.component.mixin.RuleMixin import RuleMixin
-from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
 from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
 

bt5/erp5_open_trade/DocumentTemplateItem/portal_components/document.erp5.SubscriptionItem.py

@@ -30,13 +30,14 @@
 import zope.interface
 from AccessControl import ClassSecurityInfo
 
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
+from Products.ERP5Type import Permissions, PropertySheet
 from erp5.component.document.Item import Item
 from Products.ERP5.mixin.composition import CompositionMixin
 from erp5.component.mixin.SimulableMixin import SimulableMixin
-from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
 from Products.ERP5.mixin.periodicity import PeriodicityMixin
 from Products.ERP5Type.Base import Base
+from erp5.component.interface.IMovementGenerator import IMovementGenerator
 
 class SubscriptionItem(Item, CompositionMixin, MovementGeneratorMixin,
                        SimulableMixin, PeriodicityMixin):
@@ -67,7 +68,7 @@ class SubscriptionItem(Item, CompositionMixin, MovementGeneratorMixin,
                     )
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IMovementGenerator,
+  zope.interface.implements(IMovementGenerator,
                            )
 
   def _createRootAppliedRule(self):

bt5/erp5_pdm/DocumentTemplateItem/portal_components/document.erp5.AssortedResource.py

@@ -31,7 +31,7 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, Constraint
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5Type.Utils import cartesianProduct
-from Products.ERP5.Document.AmountGeneratorLine import AmountGeneratorLine
+from erp5.component.document.AmountGeneratorLine import AmountGeneratorLine
 from erp5.component.document.TransformedResource import TransformedResource
 
 from Products.CMFCore.Expression import Expression

bt5/erp5_pdm/DocumentTemplateItem/portal_components/document.erp5.Transformation.py

@@ -38,7 +38,7 @@ from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5.Document.Amount import Amount
 from Products.ERP5.Document.MappedValue import MappedValue
 
-from Products.ERP5.mixin.amount_generator import AmountGeneratorMixin
+from erp5.component.mixin.AmountGeneratorMixin import AmountGeneratorMixin
 from Products.ERP5.mixin.variated import VariatedMixin
 
 # XXX Give priority to VariatedMixin (over Amount) due to conflicting

bt5/erp5_pdm/DocumentTemplateItem/portal_components/document.erp5.TransformedResource.py

@@ -32,7 +32,7 @@
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5.Document.AmountGeneratorLine import AmountGeneratorLine
+from erp5.component.document.AmountGeneratorLine import AmountGeneratorLine
 
 
 class TransformedResource(AmountGeneratorLine):

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

@@ -33,7 +33,7 @@ from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.CMFActivity.ActiveProcess import ActiveProcess
 from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod
-from Products.ERP5.interfaces.movement import IMovement
+from erp5.component.interface.IMovement import IMovement
 from erp5.component.interface.ISolver import ISolver
 from erp5.component.interface.IConfigurable import IConfigurable
 

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

@@ -33,7 +33,7 @@ from AccessControl.PermissionRole import PermissionRole
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.XMLObject import XMLObject
 
-from Products.ERP5.Document.Movement import Movement
+from erp5.component.document.Movement import Movement
 
 class Container(Movement, XMLObject):
   """

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

@@ -30,7 +30,7 @@ import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from erp5.component.mixin.RuleMixin import RuleMixin
-from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
 from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
 from erp5.component.interface.IRule import IRule

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

@@ -30,7 +30,7 @@ import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from erp5.component.mixin.RuleMixin import RuleMixin
-from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
 from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
 from erp5.component.interface.IRule import IRule

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

@@ -30,7 +30,7 @@ import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from erp5.component.mixin.RuleMixin import RuleMixin
-from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
 from erp5.component.mixin.MovementCollectionUpdaterMixin import \
      MovementCollectionUpdaterMixin
 from erp5.component.interface.IRule import IRule

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

@@ -35,12 +35,14 @@ import zope.interface
 
 from AccessControl import ClassSecurityInfo
 
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
+from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5.mixin.composition import _getEffectiveModel
 from Products.ERP5.Document.MappedValue import MappedValue
-from Products.ERP5.mixin.amount_generator import AmountGeneratorMixin
+from erp5.component.mixin.AmountGeneratorMixin import AmountGeneratorMixin
 from Products.ERP5.mixin.variated import VariatedMixin
 from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
+from erp5.component.interface.IAmountGenerator import IAmountGenerator
+from erp5.component.interface.IMovementGenerator import IMovementGenerator
 
 class TradeCondition(MappedValue, AmountGeneratorMixin, VariatedMixin):
   """
@@ -73,8 +75,8 @@ class TradeCondition(MappedValue, AmountGeneratorMixin, VariatedMixin):
                            # if not present. Cleaning required.
                     )
 
-  zope.interface.implements(interfaces.IAmountGenerator,
-                            interfaces.IMovementGenerator,
+  zope.interface.implements(IAmountGenerator,
+                            IMovementGenerator,
                             IMovementCollectionUpdater,)
 
 

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

@@ -28,8 +28,10 @@
 ##############################################################################
 
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet, interfaces
+from Products.ERP5Type import Permissions, PropertySheet
 from erp5.component.document.TradeModelLine import TradeModelLine
+from erp5.component.interface.IAmountGenerator import IAmountGenerator
+
 import zope.interface
 
 class TradeModelCell(TradeModelLine):
@@ -46,7 +48,7 @@ class TradeModelCell(TradeModelLine):
   # Declarative interfaces
   #    interfaces.IVariated as soon as interfaces.IVariated will be zope3
   zope.interface.implements(
-      interfaces.IAmountGenerator
+      IAmountGenerator
   )
 
   # Declarative properties

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

@@ -30,7 +30,7 @@
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5.Document.AmountGeneratorLine import AmountGeneratorLine
+from erp5.component.document.AmountGeneratorLine import AmountGeneratorLine
 
 class TradeModelLine(AmountGeneratorLine):
   """Trade Model Line is a way to represent trade transformation for movements"""

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

@@ -28,12 +28,12 @@
 
 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.Amount import Amount
 from Products.ERP5.Document.MappedValue import MappedValue
-from Products.ERP5.mixin.amount_generator import AmountGeneratorMixin
-
+from erp5.component.mixin.AmountGeneratorMixin import AmountGeneratorMixin
+from erp5.component.interface.IAmountGeneratorLine import IAmountGeneratorLine
 
 class AmountGeneratorLine(MappedValue, XMLMatrix, Amount,
                           AmountGeneratorMixin):
@@ -46,7 +46,7 @@ class AmountGeneratorLine(MappedValue, XMLMatrix, Amount,
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IAmountGeneratorLine)
+  zope.interface.implements(IAmountGeneratorLine)
 
   # Declarative properties
   property_sheets = (PropertySheet.DublinCore,

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.AmountGeneratorLine.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>_recorded_property_dict</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>AmountGeneratorLine</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.AmountGeneratorLine</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.AmountGeneratorLine</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">AAAAAAAAAAM=</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/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <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">AAAAAAAAAAQ=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <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

@@ -35,17 +35,18 @@ from AccessControl.SecurityManagement import getSecurityManager, \
     setSecurityManager, newSecurityManager
 from AccessControl.User import nobody
 from AccessControl.PermissionRole import PermissionRole
-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.XMLObject import XMLObject
-from Products.ERP5.mixin.amount_generator import AmountGeneratorMixin
 from erp5.component.document.ImmobilisationDelivery import ImmobilisationDelivery
+from erp5.component.mixin.AmountGeneratorMixin import AmountGeneratorMixin
 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
+from erp5.component.interface.IAmountGenerator import IAmountGenerator
 
 class Delivery(XMLObject, ImmobilisationDelivery, SimulableMixin,
                CompositionMixin, AmountGeneratorMixin):
@@ -76,7 +77,7 @@ class Delivery(XMLObject, ImmobilisationDelivery, SimulableMixin,
                     )
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IAmountGenerator,
+  zope.interface.implements(IAmountGenerator,
                             IDivergenceController,
                             IMovementCollection)
 

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

@@ -35,9 +35,9 @@ from AccessControl.PermissionRole import PermissionRole
 
 from Products.ERP5Type import Permissions, PropertySheet
 
-from Products.ERP5.Document.Movement import Movement
+from erp5.component.document.Movement import Movement
 from Products.ERP5.Document.MappedValue import MappedValue
-from Products.ERP5.Document.ImmobilisationMovement import ImmobilisationMovement
+from erp5.component.document.ImmobilisationMovement import ImmobilisationMovement
 from erp5.component.interface.IDivergenceController import IDivergenceController
 
 class DeliveryCell(MappedValue, Movement, ImmobilisationMovement):

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

@@ -33,8 +33,8 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 
-from Products.ERP5.Document.Movement import Movement
-from Products.ERP5.Document.ImmobilisationMovement import ImmobilisationMovement
+from erp5.component.document.Movement import Movement
+from erp5.component.document.ImmobilisationMovement import ImmobilisationMovement
 
 from inspect import getargspec
 from Products.ERP5Type.Base import Base

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

 ##############################################################################
+
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
 #                    Jean-Paul Smets-Solanes <jp@nexedi.com>
@@ -31,7 +32,7 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
 from Products.ERP5Type.Globals import InitializeClass
-from Products.ERP5.Document.Movement import Movement
+from erp5.component.document.Movement import Movement
 from Products.ERP5.Document.EmailDocument import EmailDocument
 
 class AcknowledgeableMixin:

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Event.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>Event</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.Event</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.Event</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.ImmobilisableItem.py

@@ -40,9 +40,9 @@ from Products.ERP5Type.DateUtils import getAccountableYearFraction
 from Products.ERP5.Document.Amount import Amount
 from erp5.component.document.Item import Item
 from Products.CMFCore.utils import getToolByName
-from Products.ERP5.Document.ImmobilisationMovement import (
+from erp5.component.document.ImmobilisationMovement import (
     UNIMMOBILISING_METHOD, NO_CHANGE_METHOD, AMORTISATION_METHOD_PREFIX )
-from Products.ERP5.Document.ImmobilisationMovement import (
+from erp5.component.document.ImmobilisationMovement import (
     IMMOBILISATION_NEEDED_PROPERTY_LIST,
     IMMOBILISATION_UNCONTINUOUS_NEEDED_PROPERTY_LIST,
     IMMOBILISATION_FACULTATIVE_PROPERTY_LIST )

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

@@ -31,7 +31,7 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 
 from Products.ERP5Type.XMLObject import XMLObject
-from Products.ERP5.Document.Movement import Movement
+from erp5.component.document.Movement import Movement
 
 from string import capitalize
 
@@ -119,17 +119,19 @@ class ImmobilisationMovement(Movement, XMLObject):
     def checkValue(variable,
                    forbidden_value_list=None,
                    authorized_value_list=None,
-                   error_message=["Error Type", 0, "Error message"]):
+                   error_message=None):
+      if error_message is None:
+        error_message = ["Error Type", 0, "Error message"]
       if forbidden_value_list is not None:
-        if type(forbidden_value_list) != type([]):
+        if not isinstance(forbidden_value_list, list):
           forbidden_value_list = [forbidden_value_list]
         if variable in forbidden_value_list:
-          return [ tuple([relative_url] + error_message) ]
+          return [relative_url] + error_message
       if authorized_value_list is not None:
-        if type(authorized_value_list) != type([]):
+        if not isinstance(authorized_value_list, list):
           authorized_value_list = [authorized_value_list]
         if variable not in authorized_value_list:
-          return [ tuple([relative_url] + error_message) ]
+          return [relative_url] + error_message
       return []
 
     errors = []
@@ -262,7 +264,7 @@ class ImmobilisationMovement(Movement, XMLObject):
     'item' can be None to access parameters on a movement whose method is not NO_CHANGE_METHOD nor None
     """
     parameter_dict = {}
-    if type(parameter_list) == type(""):
+    if isinstance(parameter_list, str):
       parameter_list = [parameter_list]
     for parameter in parameter_list:
       parameter_dict[parameter] = None
@@ -279,7 +281,7 @@ class ImmobilisationMovement(Movement, XMLObject):
         param_list = parameter_dict[key]
         if param_list is None:
           new_parameter_dict[key] = []
-        if type(param_list) != type([]) and type(param_list) != type(()):
+        if not isinstance(param_list, (list, tuple)):
           param_list = [param_list]
         new_param_list = []
         for param in param_list:
@@ -287,7 +289,7 @@ class ImmobilisationMovement(Movement, XMLObject):
             if param.find(split_char) != -1:
               param = param.split(split_char)
               param = [x.strip() for x in param]
-            if type(param) != type([]) and type(param) != type(()):
+            if not isinstance(param, (list, tuple)):
               param = [param]
             if len(param) > split_qty:
               param = param[:split_qty]

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.ImmobilisationMovement.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>ImmobilisationMovement</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.ImmobilisationMovement</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.ImmobilisationMovement</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.InventoryLine.py

@@ -32,7 +32,7 @@ from Acquisition import aq_base
 
 from Products.ERP5Type import Permissions, PropertySheet
 from erp5.component.document.DeliveryLine import DeliveryLine
-from Products.ERP5.Document.Movement import Movement
+from erp5.component.document.Movement import Movement
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
 
 class InventoryLine(DeliveryLine):

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

@@ -31,9 +31,9 @@ from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet
 
-from Products.ERP5.Document.Event import Event
+from erp5.component.document.Event import Event
 
-_MARKER = []
+_MARKER = ()
 
 class MailMessage(Event):
   """

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.MailMessage.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>MailMessage</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.MailMessage</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.MailMessage</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/Document/Movement.py → product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Movement.py

@@ -38,12 +38,13 @@ from Products.ERP5Type.Base import Base
 #from Products.ERP5.Core import MetaNode, MetaResource
 
 from Products.ERP5Type.XMLObject import XMLObject
-from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
 from Products.ERP5Type.UnrestrictedMethod import unrestricted_apply
-from Products.ERP5.mixin.amount_generator import AmountGeneratorMixin
+from erp5.component.mixin.AmountGeneratorMixin import AmountGeneratorMixin
 from Products.ERP5.mixin.composition import CompositionMixin
 from Products.ERP5.Document.Amount import Amount
 from Products.ERP5Type.Cache import transactional_cached
+from erp5.component.interface.IAmountGenerator import IAmountGenerator
+from erp5.component.interface.IMovement import IMovement
 
 from zLOG import LOG, WARNING
 
@@ -204,9 +205,9 @@ class Movement(XMLObject, Amount, CompositionMixin, AmountGeneratorMixin):
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IAmountGenerator,
+  zope.interface.implements(IAmountGenerator,
                             interfaces.IVariated,
-                            interfaces.IMovement)
+                            IMovement)
 
   # Declarative properties
   property_sheets = ( PropertySheet.Base

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Movement.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>Movement</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.Movement</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.Movement</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/Document/Project.py → product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Project.py

@@ -34,41 +34,40 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
 from Products.ERP5.Document.Node import Node
-from Products.ERP5.Document.Movement import Movement
+from erp5.component.document.Movement import Movement
+from erp5.component.interface.IMovement import IMovement
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 
 class Project(Node, Movement, XMLMatrix):
-    """
-    Project is a class which describes a typical project in consulting firm.
-    A project has a client, an invoiced client. A project has also a start
-    date and a stop date. It is composed of several tasks.
+  """
+  Project is a class which describes a typical project in consulting firm.
+  A project has a client, an invoiced client. A project has also a start
+  date and a stop date. It is composed of several tasks.
 
-    Each task has a person to perform it, a certain amount of time, a date,
-    a place, a description. For each person and each task, there is dedicated
-    time rate.
-    """
+  Each task has a person to perform it, a certain amount of time, a date,
+  a place, a description. For each person and each task, there is dedicated
+  time rate.
+  """
+  meta_type = 'ERP5 Project'
+  portal_type = 'Project'
+  add_permission = Permissions.AddPortalContent
+  # XXX to index start_date and stop_date in delivery table:
+  isDelivery = ConstantGetter('isDelivery', value=True)
+  isAccountable = ConstantGetter('isAccountable', value=False)
 
-    meta_type = 'ERP5 Project'
-    portal_type = 'Project'
-    add_permission = Permissions.AddPortalContent
-    # XXX to index start_date and stop_date in delivery table:
-    isDelivery = ConstantGetter('isDelivery', value=True)
-    isAccountable = ConstantGetter('isAccountable', value=False)
+  zope.interface.implements(interfaces.INode, IMovement)
 
-    zope.interface.implements(interfaces.INode, interfaces.IMovement)
-
-    # Declarative security
-    security = ClassSecurityInfo()
-    security.declareObjectProtected(Permissions.AccessContentsInformation)
-
-    # Default Properties
-    property_sheets = (
-                       PropertySheet.Base,
-                       PropertySheet.DublinCore,
-                       PropertySheet.XMLObject,
-                       PropertySheet.CategoryCore,
-                       PropertySheet.Arrow,
-                       PropertySheet.Task,
-                       PropertySheet.Reference,
-                       )
+  # Declarative security
+  security = ClassSecurityInfo()
+  security.declareObjectProtected(Permissions.AccessContentsInformation)
 
+  # Default Properties
+  property_sheets = (
+                     PropertySheet.Base,
+                     PropertySheet.DublinCore,
+                     PropertySheet.XMLObject,
+                     PropertySheet.CategoryCore,
+                     PropertySheet.Arrow,
+                     PropertySheet.Task,
+                     PropertySheet.Reference,
+                     )
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Project.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>Project</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.Project</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.Project</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.ScriptConstraint.xml

@@ -100,24 +100,28 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
-        <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>
-      </tuple>
+      <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.SimulationMovement.py

@@ -32,7 +32,7 @@ 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 erp5.component.document.Movement import Movement
 from erp5.component.module.ExpandPolicy import policy_dict, TREE_DELIVERED_CACHE_KEY
 
 from zLOG import LOG, WARNING

product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.DocumentExtraction.xml

@@ -61,24 +61,28 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
-        <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>
-      </tuple>
+      <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/ExtensionTemplateItem/portal_components/extension.erp5.FolderWorkflowActionUtils.xml

@@ -100,24 +100,28 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
-        <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>
-      </tuple>
+      <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/ExtensionTemplateItem/portal_components/extension.erp5.InventoryBrain.xml

@@ -100,24 +100,28 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
-        <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>
-      </tuple>
+      <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/ExtensionTemplateItem/portal_components/extension.erp5.SearchUtility.xml

@@ -100,24 +100,28 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
-        <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>
-      </tuple>
+      <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/ExtensionTemplateItem/portal_components/extension.erp5.StandardSecurity.xml

@@ -100,24 +100,28 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
-        <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>
-      </tuple>
+      <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/ExtensionTemplateItem/portal_components/extension.erp5.ZODBHistory.xml

@@ -100,24 +100,28 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
-        <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>
-      </tuple>
+      <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/accounting_movement.py → product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IAccountingMovement.py

 # -*- coding: utf-8 -*-
+
 ##############################################################################
 #
 # Copyright (c) 2009 Nexedi SA and Contributors. All Rights Reserved.
@@ -27,7 +28,7 @@
 #
 ##############################################################################
 
-from Products.ERP5.interfaces.asset_movement import IAssetMovement
+from erp5.component.interface.IAssetMovement import IAssetMovement
 
 class IAccountingMovement(IAssetMovement):
   """

product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IAccountingMovement.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>IAccountingMovement</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.accounting_movement</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IAccountingMovement</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/amount_generator.py → product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IAmountGenerator.py

@@ -28,7 +28,7 @@
 #
 ##############################################################################
 """
-Products.ERP5.interfaces.amount_generator
+erp5.component.interface.IAmountGenerator
 """
 
 from zope.interface import Interface
@@ -84,4 +84,4 @@ class IAmountGenerator(Interface):
     """
 
 # For backward compatibility only
-from Products.ERP5.interfaces.amount_generator_line import IAmountGeneratorLine
+from erp5.component.interface.IAmountGeneratorLine import IAmountGeneratorLine # pylint: disable=unused-import
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IAmountGenerator.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>IAmountGenerator</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.amount_generator</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IAmountGenerator</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/amount_generator_line.py → product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IAmountGeneratorLine.py

@@ -28,7 +28,7 @@
 #
 ##############################################################################
 """
-Products.ERP5.interfaces.amount_generator_line
+erp5.component.interface.IAmountGeneratorLine
 """
 
 from zope.interface import Interface

product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IAmountGeneratorLine.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>IAmountGeneratorLine</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.amount_generator_line</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IAmountGeneratorLine</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.IAssetMovement.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>IAssetMovement</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.asset_movement</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IAssetMovement</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/movement.py → product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IMovement.py

@@ -27,7 +27,7 @@
 #
 ##############################################################################
 
-from Products.ERP5.interfaces.production_movement import IProductionMovement
+from erp5.component.interface.IProductionMovement import IProductionMovement
 from Products.ERP5.interfaces.arrow_base import IArrowBase
 
 class IMovement(IProductionMovement, IArrowBase):
@@ -56,5 +56,5 @@ class IMovement(IProductionMovement, IArrowBase):
     """
 
 # For backward compatibility only
-from Products.ERP5.interfaces.accounting_movement import IAccountingMovement
-from Products.ERP5.interfaces.asset_movement import IAssetMovement
+from erp5.component.interface.IAccountingMovement import IAccountingMovement # pylint: disable=unused-import
+from erp5.component.interface.IAssetMovement import IAssetMovement # pylint: disable=unused-import
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IMovement.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>IMovement</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.movement</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IMovement</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/movement_generator.py → product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IMovementGenerator.py

@@ -28,7 +28,7 @@
 #
 ##############################################################################
 """
-Products.ERP5.interfaces.movement_generator
+erp5.component.interface.IMovementGenerator
 """
 
 from zope.interface import Interface

product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IMovementGenerator.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>IMovementGenerator</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.movement_generator</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IMovementGenerator</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.IMovementList.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>IMovementList</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.movement_list</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IMovementList</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.IProductionMovement.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>IProductionMovement</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.production_movement</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IProductionMovement</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.ISimulationMovement.py

@@ -31,7 +31,7 @@ erp5.component.interface.ISimulationMovement
 """
 
 from Products.ERP5.interfaces.property_recordable import IPropertyRecordable
-from Products.ERP5.interfaces.movement import IMovement
+from erp5.component.interface.IMovement import IMovement
 from erp5.component.interface.IDivergenceController import IDivergenceController
 from Products.ERP5.interfaces.explainable import IExplainable
 

product/ERP5/mixin/amount_generator.py → product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.AmountGeneratorMixin.py

@@ -33,9 +33,10 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.Globals import InitializeClass
 from Acquisition import aq_base, Implicit
 from Products.ERP5.GeneratedAmountList import GeneratedAmountList
-from Products.ERP5Type import Permissions, interfaces
+from Products.ERP5Type import Permissions
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
 from Products.ERP5.Document.MappedValue import MappedValue
+from erp5.component.interface.IAmountGenerator import IAmountGenerator
 
 # XXX What should be done when there is no base_application ?
 #     There are 2 options:
@@ -174,7 +175,7 @@ class BaseAmountResolver(BaseAmountDict):
 
     contribution_dict = None
 
-    def __init__(self, property_dict, contribution_dict):
+    def __init__(self, property_dict, contribution_dict): # pylint: disable=super-init-not-called
       self.property_dict = property_dict
       self.contribution_dict = contribution_dict
 
@@ -187,7 +188,7 @@ class BaseAmountResolver(BaseAmountDict):
             self |= node()
       return self
 
-  def __init__(self, cache, method_kw):
+  def __init__(self, cache, method_kw): # pylint: disable=super-init-not-called
     self._dict = cache.setdefault(None, {})
     self._cache = cache
     self._method_kw = method_kw
@@ -256,7 +257,7 @@ class AmountGeneratorMixin:
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IAmountGenerator,)
+  zope.interface.implements(IAmountGenerator,)
 
   security.declareProtected(Permissions.AccessContentsInformation,
                             'getGeneratedAmountList')

product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.AmountGeneratorMixin.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>AmountGeneratorMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.mixin.amount_generator</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>mixin.erp5.AmountGeneratorMixin</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/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.MovementGeneratorMixin.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>MovementGeneratorMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.mixin.movement_generator</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>mixin.erp5.MovementGeneratorMixin</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/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewDetail/my_template_module_component_id_list.xml

@@ -275,7 +275,7 @@
                 </item>
                 <item>
                     <key> <string>view_separator</string> </key>
-                    <value> <string> </string> </value>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewDetail/my_template_tool_component_id_list.xml

@@ -275,7 +275,7 @@
                 </item>
                 <item>
                     <key> <string>view_separator</string> </key>
-                    <value> <string> </string> </value>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>

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

@@ -79,24 +79,28 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
-        <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>
-      </tuple>
+      <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.DiffTool.xml

@@ -79,24 +79,28 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
-        <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>
-      </tuple>
+      <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.AmountGeneratorLine
 document.erp5.AppliedRule
 document.erp5.Delivery
 document.erp5.DeliveryCell
 document.erp5.DeliveryLine
+document.erp5.Event
 document.erp5.ImmobilisationDelivery
 document.erp5.ImmobilisableItem
+document.erp5.ImmobilisationMovement
 document.erp5.Inventory
 document.erp5.InventoryCell
 document.erp5.InventoryLine
 document.erp5.InvoiceCell
 document.erp5.InvoiceLine
 document.erp5.Item
+document.erp5.MailMessage
+document.erp5.Movement
 document.erp5.Order
 document.erp5.PackingList
+document.erp5.Project
 document.erp5.ScriptConstraint
 document.erp5.SimulationMovement
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/bt/template_extension_id_list

 extension.erp5.DocumentExtraction
+extension.erp5.FolderWorkflowActionUtils
 extension.erp5.InventoryBrain
+extension.erp5.PythonCodeUtils
 extension.erp5.SearchUtility
 extension.erp5.StandardSecurity
-extension.erp5.ZODBHistory
-extension.erp5.FolderWorkflowActionUtils
-extension.erp5.PythonCodeUtils
\ No newline at end of file
+extension.erp5.ZODBHistory
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/bt/template_interface_id_list

+interface.erp5.IAccountingMovement
+interface.erp5.IAmountGenerator
+interface.erp5.IAmountGeneratorLine
+interface.erp5.IAssetMovement
 interface.erp5.IDivergenceController
 interface.erp5.IExpandable
 interface.erp5.IImmobilisationItem
+interface.erp5.IMovement
 interface.erp5.IMovementCollection
 interface.erp5.IMovementCollectionDiff
 interface.erp5.IMovementCollectionUpdater
+interface.erp5.IMovementGenerator
+interface.erp5.IMovementList
+interface.erp5.IProductionMovement
 interface.erp5.IRule
 interface.erp5.ISimulationMovement
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/bt/template_mixin_id_list

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

product/ERP5/tests/testERP5Interfaces.py

@@ -55,7 +55,7 @@ implements_tuple_list = [
   (('erp5.component.document.OOoDocument', 'OOoDocument'), 'IDocument'),
   (('Products.ERP5.Document.TextDocument', 'TextDocument'), 'IDocument'),
   (('Products.ERP5.Document.EmailDocument', 'EmailDocument'), 'IDocument'),
-  (('Products.ERP5.Document.Event', 'Event'), 'IDocument'),
+  (('erp5.component.document.Event', 'Event'), 'IDocument'),
   # IAmountList
   (('Products.ERP5.GeneratedAmountList', 'GeneratedAmountList'), 'IAmountList'),
 ]

product/ERP5/tests/testTradeModelLine.py

@@ -881,7 +881,7 @@ return context""" % (base_amount, base_amount))
       sum((x.getTotalPrice() for x in amount_list), total_price))
 
   def test_05_dependencyResolution(self):
-    from Products.ERP5.mixin.amount_generator import BaseAmountResolver
+    from erp5.component.mixin.AmountGeneratorMixin import BaseAmountResolver
     delivery_amount = self.portal.newContent(temp_object=True, portal_type='Amount', id='')
     trade_model_line = self.portal.newContent(temp_object=True, portal_type='Trade Model Line', id='')
     def case(*lines):

product/ERP5Type/dynamic/accessor_holder.py

@@ -113,6 +113,53 @@ class AccessorHolderModuleType(ModuleType):
 
         delattr(self, klass.__name__)
 
+# For backward compatibility only: define provideIFoo() method where Foo has
+# been migrated from filesystem to ZODB Components. Needed until bt5 shipping
+# these Interfaces have been upgraded as these are called here and there (for
+# example on cataloging...).
+migrated_interface_list = [
+  'IAccountingMovement',
+  'IAmountGenerator',
+  'IAmountGeneratorLine',
+  'IAssetMovement',
+  'IBuildableBusinessLinkProcess',
+  'IBusinessLink',
+  'IBusinessLinkProcess',
+  'IBusinessProcess',
+  'IBusinessProcessUnionProvider',
+  'IConfigurable',
+  'IConfiguratorItem',
+  'ICoordinate',
+  'IDeliverySolver',
+  'IDivergenceController',
+  'IDivergenceMessage',
+  'IEncryptedPassword',
+  'IEquivalenceTester',
+  'IExpandable',
+  'IImmobilisationItem',
+  'ILoginAccountProvider',
+  'IMovement',
+  'IMovementCollection',
+  'IMovementCollectionDiff',
+  'IMovementCollectionUpdater',
+  'IMovementGenerator',
+  'IMovementGroup',
+  'IMovementList',
+  'IProductionMovement',
+  'IRoundingTool',
+  'IRule',
+  'ISimulationMovement',
+  'ISimulationMovementProcess',
+  'ISmsReceivingGateway',
+  'ISmsSendingGateway',
+  'ISolver',
+  'ITradeModelPath',
+  'ITradeModelPathProcess',
+  'ITradePhaseProcess',
+  'ITradeStateProcess',
+  'IWatermarkable',
+  ]
+
 def _generateBaseAccessorHolder(portal):
   """
   Create once an accessor holder that contains all accessors common to
@@ -156,7 +203,8 @@ def _generateBaseAccessorHolder(portal):
     accessor_name = 'provides' + class_id
     setattr(accessor_holder, accessor_name, lambda self: self.provides(class_id))
     accessor_holder.security.declarePublic(accessor_name)
-  for class_id in portal.portal_types.getInterfaceTypeList():
+  for class_id in set(portal.portal_types.getInterfaceTypeList() +
+                      migrated_interface_list):
     provides(class_id)
 
   erp5.accessor_holder.registerAccessorHolder(accessor_holder)