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
Ophélie Gagnard
slapos.core
Commits
37444d17
Commit
37444d17
authored
Jul 06, 2020
by
Rafael Monnerat
👻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_accounting: fixup source definition when generate aggregated Sale Packing Lists
parent
725c3231
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
...ting/OrderBuilder_generateSlapOSAggregatedMovementList.py
+1
-1
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_selectSlapOSAggregatedDeliveryList.py
...unting/OrderBuilder_selectSlapOSAggregatedDeliveryList.py
+1
-1
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 @
37444d17
...
@@ -55,7 +55,7 @@ for movement in movement_list:
...
@@ -55,7 +55,7 @@ for movement in movement_list:
portal_type
=
"Simulation Movement"
,
portal_type
=
"Simulation Movement"
,
quantity
=
movement
.
getQuantity
(),
quantity
=
movement
.
getQuantity
(),
resource
=
movement
.
getResource
(),
resource
=
movement
.
getResource
(),
source
=
movement
.
get
Destination
(),
source
=
movement
.
get
Source
(),
destination
=
movement
.
getDestination
(),
destination
=
movement
.
getDestination
(),
source_section
=
movement
.
getSourceSection
(),
source_section
=
movement
.
getSourceSection
(),
destination_section
=
movement
.
getDestination
(),
destination_section
=
movement
.
getDestination
(),
...
...
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_selectSlapOSAggregatedDeliveryList.py
View file @
37444d17
...
@@ -6,7 +6,7 @@ portal = context.getPortalObject()
...
@@ -6,7 +6,7 @@ portal = context.getPortalObject()
def
newPackingList
(
movement
,
causality
,
message
):
def
newPackingList
(
movement
,
causality
,
message
):
delivery
=
portal
.
sale_packing_list_module
.
newContent
(
delivery
=
portal
.
sale_packing_list_module
.
newContent
(
portal_type
=
'Sale Packing List'
,
portal_type
=
'Sale Packing List'
,
source
=
movement
.
get
Destination
(),
source
=
movement
.
get
Source
(),
destination
=
movement
.
getDestination
(),
destination
=
movement
.
getDestination
(),
source_section
=
movement
.
getSourceSection
(),
source_section
=
movement
.
getSourceSection
(),
destination_section
=
movement
.
getDestination
(),
destination_section
=
movement
.
getDestination
(),
...
...
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingBuilder.py
View file @
37444d17
...
@@ -1262,7 +1262,7 @@ class TestSlapOSAggregatedDeliveryBuilder(SlapOSTestCaseMixin):
...
@@ -1262,7 +1262,7 @@ class TestSlapOSAggregatedDeliveryBuilder(SlapOSTestCaseMixin):
'destination_decision/%s'
%
person
.
getRelativeUrl
(),
'destination_decision/%s'
%
person
.
getRelativeUrl
(),
'destination_section/%s'
%
person
.
getRelativeUrl
(),
'destination_section/%s'
%
person
.
getRelativeUrl
(),
'price_currency/currency_module/EUR'
,
'price_currency/currency_module/EUR'
,
'source/
%s'
%
person
.
getRelativeUrl
()
,
'source/
organisation_module/slapos'
,
'source_section/organisation_module/slapos'
,
'source_section/organisation_module/slapos'
,
'specialise/sale_trade_condition_module/'
'specialise/sale_trade_condition_module/'
'slapos_aggregated_trade_condition'
],
'slapos_aggregated_trade_condition'
],
...
...
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