Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Xavier Thompson
erp5
Commits
167e4417
Commit
167e4417
authored
Apr 01, 2013
by
Tatuya Kamada
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Inventory: Fix a issue actual stocks are not cancelled when cancelling inventories.
parent
9368a860
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
product/ERP5/Document/Inventory.py
product/ERP5/Document/Inventory.py
+5
-1
product/ERP5/tests/testInventory.py
product/ERP5/tests/testInventory.py
+0
-1
No files found.
product/ERP5/Document/Inventory.py
View file @
167e4417
...
@@ -96,7 +96,11 @@ class Inventory(Delivery):
...
@@ -96,7 +96,11 @@ class Inventory(Delivery):
sql_catalog_id
=
kw
.
pop
(
"sql_catalog_id"
,
None
)
sql_catalog_id
=
kw
.
pop
(
"sql_catalog_id"
,
None
)
disable_archive
=
kw
.
pop
(
"disable_archive"
,
0
)
disable_archive
=
kw
.
pop
(
"disable_archive"
,
0
)
if
self
.
getSimulationState
()
in
self
.
getPortalDraftOrderStateList
():
draft_state_list
=
list
(
self
.
getPortalDraftOrderStateList
())
# we need reindex when we do cancelling inventories
if
'cancelled'
in
draft_state_list
:
draft_state_list
.
remove
(
'cancelled'
)
if
self
.
getSimulationState
()
in
draft_state_list
:
# this prevent from trying to calculate stock
# this prevent from trying to calculate stock
# with not all properties defined and thus making
# with not all properties defined and thus making
# request with no condition in mysql
# request with no condition in mysql
...
...
product/ERP5/tests/testInventory.py
View file @
167e4417
...
@@ -2657,7 +2657,6 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
...
@@ -2657,7 +2657,6 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
sequence_list
.
addSequenceString
(
sequence_string
)
sequence_list
.
addSequenceString
(
sequence_string
)
sequence_list
.
play
(
self
)
sequence_list
.
play
(
self
)
@
expectedFailure
def
test_05_CancelInventoryAfterDelivered
(
self
,
quiet
=
0
,
run
=
run_all_test
):
def
test_05_CancelInventoryAfterDelivered
(
self
,
quiet
=
0
,
run
=
run_all_test
):
"""
"""
Make sure that changing workflow state after delivered changes
Make sure that changing workflow state after delivered changes
...
...
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