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
04866a15
Commit
04866a15
authored
Oct 17, 2018
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_accounting: Always set price on the sale packing list
Restore the previous behaviour to set 0.0
parent
900d2790
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
...ting/OrderBuilder_generateSlapOSAggregatedMovementList.py
+2
-0
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingBuilder.py
...ortal_components/test.erp5.testSlapOSAccountingBuilder.py
+1
-1
No files found.
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
View file @
04866a15
...
@@ -47,6 +47,8 @@ for movement in movement_list:
...
@@ -47,6 +47,8 @@ for movement in movement_list:
if
movement
.
getResource
()
==
'service_module/slapos_instance_subscription'
:
if
movement
.
getResource
()
==
'service_module/slapos_instance_subscription'
:
# reduce tax from there directly
# reduce tax from there directly
temp_movement
.
edit
(
price
=
movement
.
getPrice
(
0.0
)
/
1.2
)
temp_movement
.
edit
(
price
=
movement
.
getPrice
(
0.0
)
/
1.2
)
else
:
temp_movement
.
edit
(
price
=
0.0
)
temp_movement_list
.
append
(
temp_movement
)
temp_movement_list
.
append
(
temp_movement
)
id
+=
1
id
+=
1
...
...
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingBuilder.py
View file @
04866a15
...
@@ -1336,7 +1336,7 @@ class TestSlapOSAggregatedDeliveryBuilder(SlapOSTestCaseMixin):
...
@@ -1336,7 +1336,7 @@ class TestSlapOSAggregatedDeliveryBuilder(SlapOSTestCaseMixin):
built_update_line
.
getResource
())
built_update_line
.
getResource
())
self
.
assertEqual
(
1.0
,
built_subscription_line
.
getQuantity
())
self
.
assertEqual
(
1.0
,
built_subscription_line
.
getQuantity
())
self
.
assertAlmostEquals
(
0.
836
,
built_subscription_line
.
getPrice
(),
3
)
self
.
assertAlmostEquals
(
0.
0
,
built_subscription_line
.
getPrice
(),
3
)
self
.
assertEqual
(
subscription_line
.
getResource
(),
self
.
assertEqual
(
subscription_line
.
getResource
(),
built_subscription_line
.
getResource
())
built_subscription_line
.
getResource
())
...
...
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