From 4fdb18318a0fc2c3fcb282459c20c41fe9c90041 Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 19 Jul 2021 16:32:36 +1000 Subject: [PATCH 1/2] Add "installed_items" as a context variable to the StockItem TestReport template --- InvenTree/report/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py index c33347f643..db06e1c95b 100644 --- a/InvenTree/report/models.py +++ b/InvenTree/report/models.py @@ -357,7 +357,8 @@ class TestReport(ReportTemplateBase): 'serial': stock_item.serial, 'part': stock_item.part, 'results': stock_item.testResultMap(include_installed=self.include_installed), - 'result_list': stock_item.testResultList(include_installed=self.include_installed) + 'result_list': stock_item.testResultList(include_installed=self.include_installed), + 'installed_items': stock_item.get_installed_items(cascade=True), } From 87d4a515750b780f8c8ef817c3ab3a37e800f0b0 Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 19 Jul 2021 16:44:56 +1000 Subject: [PATCH 2/2] Add "installed items" section to default TestReport --- .../report/inventree_test_report_base.html | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/InvenTree/report/templates/report/inventree_test_report_base.html b/InvenTree/report/templates/report/inventree_test_report_base.html index 4c585d531b..d6d9c5644f 100644 --- a/InvenTree/report/templates/report/inventree_test_report_base.html +++ b/InvenTree/report/templates/report/inventree_test_report_base.html @@ -56,6 +56,10 @@ content: "{% trans 'Stock Item Test Report' %}"; {% endblock %} +{% block pre_page_content %} + +{% endblock %} + {% block page_content %}
@@ -80,6 +84,7 @@ content: "{% trans 'Stock Item Test Report' %}";
+{% if resul_list|length > 0 %}

{% trans "Test Results" %}

@@ -112,5 +117,37 @@ content: "{% trans 'Stock Item Test Report' %}";
+{% endif %} + +{% if installed_items|length > 0 %} +

{% trans "Installed Items" %}

+ + + + + + {% for sub_item in installed_items %} + + + + + {% endfor %} + +
+ + {{ sub_item.part.full_name }} + + {% if sub_item.serialized %} + {% trans "Serial" %}: {{ sub_item.serial }} + {% else %} + {% trans "Quantity" %}: {% decimal sub_item.quantity %} + {% endif %} +
+ +{% endif %} + +{% endblock %} + +{% block post_page_content %} {% endblock %} \ No newline at end of file