From 94f7890a4150c3d8da0e53faa3ab938e05ff5943 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 7 Jan 2025 10:34:47 +1100 Subject: [PATCH] Fix for test results in stock item report context (#8843) - Allow for "cascade" installed items - i.e. support multi-level installed items --- src/backend/InvenTree/stock/models.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/backend/InvenTree/stock/models.py b/src/backend/InvenTree/stock/models.py index a65d7a9437..6f000a1b0b 100644 --- a/src/backend/InvenTree/stock/models.py +++ b/src/backend/InvenTree/stock/models.py @@ -431,7 +431,7 @@ class StockItem( 'parameters': self.part.parameters_map(), 'quantity': InvenTree.helpers.normalize(self.quantity), 'result_list': self.testResultList(include_installed=True), - 'results': self.testResultMap(include_installed=True), + 'results': self.testResultMap(include_installed=True, cascade=True), 'serial': self.serial, 'stock_item': self, 'tests': self.testResultMap(), @@ -2439,6 +2439,7 @@ class StockItem( """ # Do we wish to include test results from installed items? include_installed = kwargs.pop('include_installed', False) + cascade = kwargs.pop('cascade', False) # Filter results by "date", so that newer results # will override older ones. @@ -2449,9 +2450,6 @@ class StockItem( for result in results: 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: installed_items = self.get_installed_items(cascade=cascade)