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
Eric Zheng
slapos.core
Commits
78df4788
Commit
78df4788
authored
Sep 20, 2020
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_accounting: Use same earlier start date when generate Aggregated Sale Packing List
parent
154faba8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
...ting/OrderBuilder_generateSlapOSAggregatedMovementList.py
+2
-2
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/SalePackingList_postSlapOSAggregatedDeliveryBuilder.py
...ng/SalePackingList_postSlapOSAggregatedDeliveryBuilder.py
+9
-1
No files found.
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
View file @
78df4788
...
@@ -84,8 +84,8 @@ for movement in movement_list:
...
@@ -84,8 +84,8 @@ for movement in movement_list:
if
subscription
is
not
None
:
if
subscription
is
not
None
:
temp_movement
.
edit
(
temp_movement
.
edit
(
specialise
=
specialise_to_set
,
specialise
=
specialise_to_set
,
causality
=
subscription
)
causality
=
subscription
,
start_date
=
movement
.
getStartDate
())
elif
movement
.
getCausality
(
portal_type
=
"Subscription Request"
)
is
not
None
:
elif
movement
.
getCausality
(
portal_type
=
"Subscription Request"
)
is
not
None
:
temp_movement
.
edit
(
temp_movement
.
edit
(
specialise
=
specialise_to_set
,
specialise
=
specialise_to_set
,
...
...
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/SalePackingList_postSlapOSAggregatedDeliveryBuilder.py
View file @
78df4788
...
@@ -33,11 +33,19 @@ input_movement_list = [restrictedTraverse(q) for q in
...
@@ -33,11 +33,19 @@ input_movement_list = [restrictedTraverse(q) for q in
if
restrictedTraverse
(
q
).
getDestination
()
==
person
and
\
if
restrictedTraverse
(
q
).
getDestination
()
==
person
and
\
restrictedTraverse
(
q
).
getSpecialise
()
in
specialise_filter_list
]
restrictedTraverse
(
q
).
getSpecialise
()
in
specialise_filter_list
]
min_start_date
=
None
for
delivery_line
in
input_movement_list
:
for
delivery_line
in
input_movement_list
:
delivery_line
.
setGroupingReference
(
reference
)
delivery_line
.
setGroupingReference
(
reference
)
if
min_start_date
is
None
:
min_start_date
=
delivery_line
.
getStartDate
()
elif
delivery_line
.
getStartDate
()
<
min_start_date
:
min_start_date
=
delivery_line
.
getStartDate
()
if
context
.
getCausalityState
()
==
'draft'
:
if
context
.
getCausalityState
()
==
'draft'
:
context
.
startBuilding
()
context
.
startBuilding
()
if
context
.
getStartDate
()
is
None
:
if
context
.
getStartDate
()
is
None
:
context
.
setStartDate
(
DateTime
().
earliestTime
())
if
min_start_date
is
None
:
min_start_date
=
DateTime
().
earliestTime
()
context
.
setStartDate
(
min_start_date
)
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