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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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