Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
17
Merge Requests
17
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
39594073
Commit
39594073
authored
May 27, 2020
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud&accounting: Fixup imports from the Documents migration to ZODB
parent
6ae9a037
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
15 deletions
+18
-15
master/bt5/slapos_accounting/DocumentTemplateItem/portal_components/document.erp5.RootAppliedRuleCausalityCausalityMovementGroup.py
...nt.erp5.RootAppliedRuleCausalityCausalityMovementGroup.py
+1
-1
master/bt5/slapos_accounting/DocumentTemplateItem/portal_components/document.erp5.SlapOSAccountingQuantityUpdatingOrderBuilder.py
...ment.erp5.SlapOSAccountingQuantityUpdatingOrderBuilder.py
+2
-2
master/bt5/slapos_accounting/DocumentTemplateItem/portal_components/document.erp5.SubscriptionItemRootSimulationRule.py
...nents/document.erp5.SubscriptionItemRootSimulationRule.py
+10
-7
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingAlarm.py
.../portal_components/test.erp5.testSlapOSAccountingAlarm.py
+3
-3
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingRule.py
...m/portal_components/test.erp5.testSlapOSAccountingRule.py
+1
-1
master/bt5/slapos_cloud/DocumentTemplateItem/portal_components/document.erp5.SoftwareInstance.py
...eItem/portal_components/document.erp5.SoftwareInstance.py
+1
-1
No files found.
master/bt5/slapos_accounting/DocumentTemplateItem/portal_components/document.erp5.RootAppliedRuleCausalityCausalityMovementGroup.py
View file @
39594073
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
#
#
##############################################################################
##############################################################################
from
Products.ERP5.D
ocument.MovementGroup
import
MovementGroup
from
erp5.component.d
ocument.MovementGroup
import
MovementGroup
class
RootAppliedRuleCausalityCausalityMovementGroup
(
MovementGroup
):
class
RootAppliedRuleCausalityCausalityMovementGroup
(
MovementGroup
):
"""
"""
...
...
master/bt5/slapos_accounting/DocumentTemplateItem/portal_components/document.erp5.SlapOSAccountingQuantityUpdatingOrderBuilder.py
View file @
39594073
from
Products.ERP5.D
ocument.GeneratedDeliveryBuilder
import
GeneratedDeliveryBuilder
from
erp5.component.d
ocument.GeneratedDeliveryBuilder
import
GeneratedDeliveryBuilder
from
Products.ERP5.mixin.builder
import
BuilderMixin
from
erp5.component.mixin.BuilderMixin
import
BuilderMixin
class
SlapOSAccountingQuantityUpdatingOrderBuilder
(
GeneratedDeliveryBuilder
):
class
SlapOSAccountingQuantityUpdatingOrderBuilder
(
GeneratedDeliveryBuilder
):
def
_setDeliveryMovementProperties
(
self
,
delivery_movement
,
def
_setDeliveryMovementProperties
(
self
,
delivery_movement
,
...
...
master/bt5/slapos_accounting/DocumentTemplateItem/portal_components/document.erp5.SubscriptionItemRootSimulationRule.py
View file @
39594073
...
@@ -32,12 +32,15 @@ will replace DeliveryRule.
...
@@ -32,12 +32,15 @@ will replace DeliveryRule.
import
zope.interface
import
zope.interface
from
AccessControl
import
ClassSecurityInfo
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.ERP5Type.Core.Predicate
import
Predicate
from
Products.ERP5.mixin.rule
import
RuleMixin
from
erp5.component.mixin.RuleMixin
import
RuleMixin
from
Products.ERP5.mixin.movement_collection_updater
import
\
from
erp5.component.mixin.MovementCollectionUpdaterMixin
import
\
MovementCollectionUpdaterMixin
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
):
class
SubscriptionItemRootSimulationRule
(
RuleMixin
,
MovementCollectionUpdaterMixin
,
Predicate
):
"""
"""
...
@@ -55,9 +58,9 @@ class SubscriptionItemRootSimulationRule(RuleMixin, MovementCollectionUpdaterMix
...
@@ -55,9 +58,9 @@ class SubscriptionItemRootSimulationRule(RuleMixin, MovementCollectionUpdaterMix
security
.
declareObjectProtected
(
Permissions
.
AccessContentsInformation
)
security
.
declareObjectProtected
(
Permissions
.
AccessContentsInformation
)
# Declarative interfaces
# Declarative interfaces
zope
.
interface
.
implements
(
interfaces
.
IRule
,
zope
.
interface
.
implements
(
IRule
,
interfaces
.
IDivergenceController
,
IDivergenceController
,
interfaces
.
IMovementCollectionUpdater
,)
IMovementCollectionUpdater
,)
# Default Properties
# Default Properties
property_sheets
=
(
property_sheets
=
(
...
...
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingAlarm.py
View file @
39594073
...
@@ -750,7 +750,7 @@ class TestSlapOSTriggerBuildAlarm(SlapOSTestCaseMixin):
...
@@ -750,7 +750,7 @@ class TestSlapOSTriggerBuildAlarm(SlapOSTestCaseMixin):
ActiveObject
.
original_activate
=
ActiveObject
.
activate
ActiveObject
.
original_activate
=
ActiveObject
.
activate
ActiveObject
.
activate
=
Simulator
(
activate_simulator
,
'activate'
,
ActiveObject
.
activate
=
Simulator
(
activate_simulator
,
'activate'
,
root_applied_rule
)
root_applied_rule
)
from
Products.ERP5.D
ocument.BusinessLink
import
BusinessLink
from
erp5.component.d
ocument.BusinessLink
import
BusinessLink
BusinessLink
.
original_build
=
BusinessLink
.
build
BusinessLink
.
original_build
=
BusinessLink
.
build
BusinessLink
.
build
=
Simulator
(
build_simulator
,
'build'
)
BusinessLink
.
build
=
Simulator
(
build_simulator
,
'build'
)
...
@@ -838,7 +838,7 @@ class TestSlapOSTriggerBuildAlarm(SlapOSTestCaseMixin):
...
@@ -838,7 +838,7 @@ class TestSlapOSTriggerBuildAlarm(SlapOSTestCaseMixin):
ActiveObject
.
original_activate
=
ActiveObject
.
activate
ActiveObject
.
original_activate
=
ActiveObject
.
activate
ActiveObject
.
activate
=
Simulator
(
activate_simulator
,
'activate'
,
ActiveObject
.
activate
=
Simulator
(
activate_simulator
,
'activate'
,
root_applied_rule
)
root_applied_rule
)
from
Products.ERP5.D
ocument.BusinessLink
import
BusinessLink
from
erp5.component.d
ocument.BusinessLink
import
BusinessLink
BusinessLink
.
original_build
=
BusinessLink
.
build
BusinessLink
.
original_build
=
BusinessLink
.
build
BusinessLink
.
build
=
Simulator
(
build_simulator
,
'build'
)
BusinessLink
.
build
=
Simulator
(
build_simulator
,
'build'
)
...
@@ -908,7 +908,7 @@ class TestSlapOSManageBuildingCalculatingDeliveryAlarm(SlapOSTestCaseMixin):
...
@@ -908,7 +908,7 @@ class TestSlapOSManageBuildingCalculatingDeliveryAlarm(SlapOSTestCaseMixin):
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery
,
state
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
delivery
,
state
)
try
:
try
:
from
Products.ERP5.D
ocument.Delivery
import
Delivery
from
erp5.component.d
ocument.Delivery
import
Delivery
Delivery
.
original_updateCausalityState
=
Delivery
.
updateCausalityState
Delivery
.
original_updateCausalityState
=
Delivery
.
updateCausalityState
Delivery
.
original_updateSimulation
=
Delivery
.
updateSimulation
Delivery
.
original_updateSimulation
=
Delivery
.
updateSimulation
Delivery
.
updateCausalityState
=
Simulator
(
Delivery
.
updateCausalityState
=
Simulator
(
...
...
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingRule.py
View file @
39594073
...
@@ -8,7 +8,7 @@ from erp5.component.test.SlapOSTestCaseMixin import SlapOSTestCaseMixin, withAbo
...
@@ -8,7 +8,7 @@ from erp5.component.test.SlapOSTestCaseMixin import SlapOSTestCaseMixin, withAbo
from
DateTime
import
DateTime
from
DateTime
import
DateTime
from
Products.ERP5Type.DateUtils
import
addToDate
from
Products.ERP5Type.DateUtils
import
addToDate
from
Products.ERP5.D
ocument.SimulationMovement
import
SimulationMovement
from
erp5.component.d
ocument.SimulationMovement
import
SimulationMovement
import
transaction
import
transaction
def
getSimulationStatePlanned
(
self
,
*
args
,
**
kwargs
):
def
getSimulationStatePlanned
(
self
,
*
args
,
**
kwargs
):
...
...
master/bt5/slapos_cloud/DocumentTemplateItem/portal_components/document.erp5.SoftwareInstance.py
View file @
39594073
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
##############################################################################
##############################################################################
from
AccessControl
import
ClassSecurityInfo
from
AccessControl
import
ClassSecurityInfo
from
Products.ERP5Type
import
Permissions
from
Products.ERP5Type
import
Permissions
from
Products.ERP5.D
ocument.Item
import
Item
from
erp5.component.d
ocument.Item
import
Item
from
lxml
import
etree
from
lxml
import
etree
import
collections
import
collections
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment