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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Titouan Soulard
slapos.core
Commits
e5f9c52c
Commit
e5f9c52c
authored
Jun 15, 2022
by
Romain Courteaud
🐙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_accounting: source_administration is not used anymore on Compute Node
parent
16396f23
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/ComputerConsumptionTioXMLFile_solveInvoicingGeneration.py
...ComputerConsumptionTioXMLFile_solveInvoicingGeneration.py
+4
-5
No files found.
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/ComputerConsumptionTioXMLFile_solveInvoicingGeneration.py
View file @
e5f9c52c
...
...
@@ -35,7 +35,6 @@ else:
# informative.
if
compute_node
.
getReference
()
==
reference
:
aggregate_value_list
=
[
compute_node
]
person
=
compute_node
.
getSourceAdministrationValue
(
portal_type
=
"Person"
)
project
=
compute_node_project
else
:
project
=
None
# For now, else we should calculate this too.
...
...
@@ -71,6 +70,7 @@ else:
portal_type
=
"Person"
)
except
:
raise
ValueError
(
instance
.
getRelativeUrl
())
person_relative_url
=
person
.
getRelativeUrl
()
aggregate_value_list
=
[
partition
,
instance
,
subscription
]
...
...
@@ -79,21 +79,20 @@ else:
quantity
=
movement
[
'quantity'
],
aggregate_value_list
=
aggregate_value_list
,
resource
=
movement
[
'resource'
],
person
=
person
.
getRelativeUrl
()
,
person
=
person
_relative_url
,
project
=
project
)
)
# Time to create the PL
person
=
compute_node
.
getSourceAdministrationValue
(
portal_type
=
"Person"
)
delivery_template
=
portal
.
restrictedTraverse
(
portal
.
portal_preferences
.
getPreferredInstanceDeliveryTemplate
())
delivery
=
delivery_template
.
Base_createCloneDocument
(
batch_mode
=
1
)
delivery
.
edit
(
title
=
delivery_title
,
destination
=
person
.
getRelativeUrl
(),
destination_decision
=
person
.
getRelativeUrl
(),
#
destination=person.getRelativeUrl(),
#
destination_decision=person.getRelativeUrl(),
start_date
=
context
.
getCreationDate
(),
)
...
...
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