inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-28 11:36:44 +00:00
Code

Fix for test results in stock item report context (#8843) (#8844)

Browse Source 
- Allow for "cascade" installed items
- i.e. support multi-level installed items

(cherry picked from commit 94f7890a4150c3d8da0e53faa3ab938e05ff5943)

Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
This commit is contained in:
github-actions[bot] 2025-01-07 10:40:08 +11:00 committed by GitHub
parent 4c6e3490c0
commit 3715c42fed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/InvenTree/stock/models.py
View File

@ -429,7 +429,7 @@ class StockItem(
'parameters': self.part.parameters_map(), 'parameters': self.part.parameters_map(),
'quantity': InvenTree.helpers.normalize(self.quantity), 'quantity': InvenTree.helpers.normalize(self.quantity),
'result_list': self.testResultList(include_installed=True), 'result_list': self.testResultList(include_installed=True),
'results': self.testResultMap(include_installed=True), 'results': self.testResultMap(include_installed=True, cascade=True),
'serial': self.serial, 'serial': self.serial,
'stock_item': self, 'stock_item': self,
'tests': self.testResultMap(), 'tests': self.testResultMap(),
@ -2406,6 +2406,7 @@ class StockItem(
""" """
# Do we wish to include test results from installed items? # Do we wish to include test results from installed items?
include_installed = kwargs.pop('include_installed', False) include_installed = kwargs.pop('include_installed', False)
cascade = kwargs.pop('cascade', False)
# Filter results by "date", so that newer results # Filter results by "date", so that newer results
# will override older ones. # will override older ones.
@ -2416,9 +2417,6 @@ class StockItem(
for result in results: for result in results:
result_map[result.key] = result result_map[result.key] = result
# Do we wish to "cascade" and include test results from installed stock items?
cascade = kwargs.get('cascade', False)
if include_installed: if include_installed:
installed_items = self.get_installed_items(cascade=cascade) installed_items = self.get_installed_items(cascade=cascade)