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
1
Merge Requests
1
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
Romain Courteaud
slapos.core
Commits
0217ebee
Commit
0217ebee
authored
Oct 13, 2023
by
Romain Courteaud
🐙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_accounting: group also outstanding amount by ledger
parent
6b9e956c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Entity_getOutstandingAmountList.py
...kins/slapos_accounting/Entity_getOutstandingAmountList.py
+7
-0
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Entity_getOutstandingAmountList.xml
...ins/slapos_accounting/Entity_getOutstandingAmountList.xml
+1
-1
No files found.
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Entity_getOutstandingAmountList.py
View file @
0217ebee
...
...
@@ -48,6 +48,11 @@ if resource_uid is None:
else
:
params
[
'resource_uid'
]
=
resource_uid
if
ledger_uid
is
None
:
params
[
'group_by_ledger'
]
=
True
else
:
params
[
'ledger_uid'
]
=
ledger_uid
for
(
idx
,
brain
)
in
enumerate
(
portal
.
portal_simulation
.
getInventoryList
(
mirror_section_uid
=
context
.
getUid
(),
simulation_state
=
simulation_state_tuple
,
...
...
@@ -66,6 +71,8 @@ for (idx, brain) in enumerate(portal.portal_simulation.getInventoryList(
payment_request
=
portal
.
portal_catalog
.
getObject
(
uid
=
payment_request_uid
)
object_list
.
append
(
payment_request
.
asContext
(
section_uid
=
brain
.
section_uid
,
resource_uid
=
brain
.
resource_uid
,
ledger_uid
=
brain
.
ledger_uid
,
payment_request_uid
=
payment_request_uid
,
node_uid
=
brain
.
node_uid
,
node_relative_url
=
brain
.
node_relative_url
,
...
...
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Entity_getOutstandingAmountList.xml
View file @
0217ebee
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
resource_uid=None, section_uid=None, group_by_node=True, at_date=None, include_planned=True, **kw
</string>
</value>
<value>
<string>
resource_uid=None, section_uid=None, group_by_node=True, at_date=None, include_planned=True,
ledger_uid=None,
**kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
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