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
0
Merge Requests
0
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
Rafael Monnerat
slapos.core
Commits
bbebfa5b
Commit
bbebfa5b
authored
Feb 15, 2019
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_accounting: Set causality into the sale packing list to subscription request
parent
06f2ac0b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
...ting/OrderBuilder_generateSlapOSAggregatedMovementList.py
+6
-3
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_selectSlapOSAggregatedDeliveryList.py
...unting/OrderBuilder_selectSlapOSAggregatedDeliveryList.py
+2
-1
No files found.
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
View file @
bbebfa5b
...
@@ -51,9 +51,12 @@ for movement in movement_list:
...
@@ -51,9 +51,12 @@ for movement in movement_list:
temp_movement
.
edit
(
price
=
0.0
)
temp_movement
.
edit
(
price
=
0.0
)
hosting_subscription
=
movement
.
getAggregateValue
(
portal_type
=
"Hosting Subscription"
)
hosting_subscription
=
movement
.
getAggregateValue
(
portal_type
=
"Hosting Subscription"
)
if
hosting_subscription
is
not
None
and
\
if
hosting_subscription
is
not
None
:
hosting_subscription
.
getAggregateRelated
(
portal_type
=
"Subscription Request"
):
subscription
=
hosting_subscription
.
getAggregateRelated
(
portal_type
=
"Subscription Request"
)
temp_movement
.
edit
(
specialise
=
subscription_request_specialise
)
if
subscription
is
not
None
:
temp_movement
.
edit
(
specialise
=
subscription_request_specialise
,
causality
=
subscription
)
temp_movement_list
.
append
(
temp_movement
)
temp_movement_list
.
append
(
temp_movement
)
...
...
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_selectSlapOSAggregatedDeliveryList.py
View file @
bbebfa5b
...
@@ -18,7 +18,8 @@ for movement in movement_list:
...
@@ -18,7 +18,8 @@ for movement in movement_list:
destination_section
=
movement
.
getDestination
(),
destination_section
=
movement
.
getDestination
(),
destination_decision
=
movement
.
getDestination
(),
destination_decision
=
movement
.
getDestination
(),
specialise
=
movement
.
getSpecialise
(),
specialise
=
movement
.
getSpecialise
(),
price_currency
=
movement
.
getPriceCurrency
()
price_currency
=
movement
.
getPriceCurrency
(),
causality
=
movement
.
getCausality
()
)
)
delivery
.
confirm
(
'New aggregated delivery.'
)
delivery
.
confirm
(
'New aggregated delivery.'
)
person
.
Person_setAggregatedDelivery
(
delivery
)
person
.
Person_setAggregatedDelivery
(
delivery
)
...
...
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