From a722057dab2660aa0fadcd34316899325fe18d9d Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 16 Feb 2021 15:46:18 +1100 Subject: [PATCH] Display responsible and issuing users for build orders --- .../build/templates/build/build_base.html | 14 +++++ InvenTree/build/templates/build/detail.html | 61 ++++++++++++------- 2 files changed, 54 insertions(+), 21 deletions(-) diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html index 671f748331..9a145b4ad6 100644 --- a/InvenTree/build/templates/build/build_base.html +++ b/InvenTree/build/templates/build/build_base.html @@ -129,6 +129,20 @@ src="{% static 'img/blank_image.png' %}" {{ build.sales_order }} {% endif %} + {% if build.issued_by %} + + + {% trans "Issued By" %} + {{ build.issued_by }} + + {% endif %} + {% if build.responsible %} + + + {% trans "Responsible" %} + {{ build.responsible }} + + {% endif %} {% endblock %} diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html index a9a2288c4e..40dc772c4f 100644 --- a/InvenTree/build/templates/build/detail.html +++ b/InvenTree/build/templates/build/detail.html @@ -90,31 +90,50 @@ {{ build.link }} {% endif %} + {% if build.issued_by %} - - {% trans "Created" %} - {{ build.creation_date }} + + {% trans "Issued By" %} + {{ build.issued_by }} + {% endif %} + {% if build.responsible %} - - {% trans "Target Date" %} - {% if build.target_date %} - - {{ build.target_date }}{% if build.is_overdue %} {% endif %} - - {% else %} - {% trans "No target date set" %} - {% endif %} - - - - {% trans "Completed" %} - {% if build.completion_date %} - {{ build.completion_date }}{% if build.completed_by %}{{ build.completed_by }}{% endif %} - {% else %} - {% trans "Build not complete" %} - {% endif %} + + {% trans "Responsible" %} + {{ build.responsible }} + {% endif %} + + +
+ + + + + + + + + + + {% if build.target_date %} + + {% else %} + + {% endif %} + + + + + {% if build.completion_date %} + + {% else %} + + {% endif %} +
{% trans "Created" %}{{ build.creation_date }}
{% trans "Target Date" %} + {{ build.target_date }}{% if build.is_overdue %} {% endif %} + {% trans "No target date set" %}
{% trans "Completed" %}{{ build.completion_date }}{% if build.completed_by %}{{ build.completed_by }}{% endif %}{% trans "Build not complete" %}