Commit 39594073 authored by Rafael Monnerat's avatar Rafael Monnerat

slapos_cloud&accounting: Fixup imports from the Documents migration to ZODB

parent 6ae9a037
......@@ -25,7 +25,7 @@
#
##############################################################################
from Products.ERP5.Document.MovementGroup import MovementGroup
from erp5.component.document.MovementGroup import MovementGroup
class RootAppliedRuleCausalityCausalityMovementGroup(MovementGroup):
"""
......
from Products.ERP5.Document.GeneratedDeliveryBuilder import GeneratedDeliveryBuilder
from Products.ERP5.mixin.builder import BuilderMixin
from erp5.component.document.GeneratedDeliveryBuilder import GeneratedDeliveryBuilder
from erp5.component.mixin.BuilderMixin import BuilderMixin
class SlapOSAccountingQuantityUpdatingOrderBuilder(GeneratedDeliveryBuilder):
def _setDeliveryMovementProperties(self, delivery_movement,
......
......@@ -32,12 +32,15 @@ will replace DeliveryRule.
import zope.interface
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, interfaces
from Products.ERP5Type import Permissions, PropertySheet
from Products.ERP5Type.Core.Predicate import Predicate
from Products.ERP5.mixin.rule import RuleMixin
from Products.ERP5.mixin.movement_collection_updater import \
from erp5.component.mixin.RuleMixin import RuleMixin
from erp5.component.mixin.MovementCollectionUpdaterMixin import \
MovementCollectionUpdaterMixin
from Products.ERP5.mixin.rule import MovementGeneratorMixin
from erp5.component.mixin.MovementGeneratorMixin import MovementGeneratorMixin
from erp5.component.interface.IRule import IRule
from erp5.component.interface.IDivergenceController import IDivergenceController
from erp5.component.interface.IMovementCollectionUpdater import IMovementCollectionUpdater
class SubscriptionItemRootSimulationRule(RuleMixin, MovementCollectionUpdaterMixin, Predicate):
"""
......@@ -55,9 +58,9 @@ class SubscriptionItemRootSimulationRule(RuleMixin, MovementCollectionUpdaterMix
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 = (
......
......@@ -750,7 +750,7 @@ class TestSlapOSTriggerBuildAlarm(SlapOSTestCaseMixin):
ActiveObject.original_activate = ActiveObject.activate
ActiveObject.activate = Simulator(activate_simulator, 'activate',
root_applied_rule)
from Products.ERP5.Document.BusinessLink import BusinessLink
from erp5.component.document.BusinessLink import BusinessLink
BusinessLink.original_build = BusinessLink.build
BusinessLink.build = Simulator(build_simulator, 'build')
......@@ -838,7 +838,7 @@ class TestSlapOSTriggerBuildAlarm(SlapOSTestCaseMixin):
ActiveObject.original_activate = ActiveObject.activate
ActiveObject.activate = Simulator(activate_simulator, 'activate',
root_applied_rule)
from Products.ERP5.Document.BusinessLink import BusinessLink
from erp5.component.document.BusinessLink import BusinessLink
BusinessLink.original_build = BusinessLink.build
BusinessLink.build = Simulator(build_simulator, 'build')
......@@ -908,7 +908,7 @@ class TestSlapOSManageBuildingCalculatingDeliveryAlarm(SlapOSTestCaseMixin):
self.portal.portal_workflow._jumpToStateFor(delivery, state)
try:
from Products.ERP5.Document.Delivery import Delivery
from erp5.component.document.Delivery import Delivery
Delivery.original_updateCausalityState = Delivery.updateCausalityState
Delivery.original_updateSimulation = Delivery.updateSimulation
Delivery.updateCausalityState = Simulator(
......
......@@ -8,7 +8,7 @@ from erp5.component.test.SlapOSTestCaseMixin import SlapOSTestCaseMixin, withAbo
from DateTime import DateTime
from Products.ERP5Type.DateUtils import addToDate
from Products.ERP5.Document.SimulationMovement import SimulationMovement
from erp5.component.document.SimulationMovement import SimulationMovement
import transaction
def getSimulationStatePlanned(self, *args, **kwargs):
......
......@@ -27,7 +27,7 @@
##############################################################################
from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions
from Products.ERP5.Document.Item import Item
from erp5.component.document.Item import Item
from lxml import etree
import collections
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment