diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html index 3a33a57cdb..43b739647a 100644 --- a/InvenTree/build/templates/build/build_base.html +++ b/InvenTree/build/templates/build/build_base.html @@ -1,4 +1,4 @@ -{% extends "two_column.html" %} +{% extends "page_base.html" %} {% load static %} {% load i18n %} @@ -9,130 +9,71 @@ {% inventree_title %} | {% trans "Build Order" %} - {{ build }} {% endblock %} -{% block pre_content %} -
- -
+{% block breadcrumbs %} +
  • {% trans "Build Orders" %}
    • +
  • {{ build }}
    • {% endblock %} -{% block below_thumbnail %} - -
    - {% if build.sales_order %} -
    - {% object_link 'so-detail' build.sales_order.id build.sales_order as link %} - {% blocktrans %}This Build Order is allocated to Sales Order {{link}}{% endblocktrans %} -
    - {% endif %} - - {% if build.parent %} -
    - {% object_link 'build-detail' build.parent.id build.parent as link %} - {% blocktrans %}This Build Order is a child of Build Order {{link}}{% endblocktrans %} -
    - {% endif %} - - {% if build.active %} - {% if build.can_complete %} -
    - {% trans "Build Order is ready to mark as completed" %} -
    - {% endif %} - {% if build.incomplete_count > 0 %} -
    - {% trans "Build Order cannot be completed as outstanding outputs remain" %} -
    - {% endif %} - {% if build.completed < build.quantity %} -
    - {% trans "Required build quantity has not yet been completed" %} -
    - {% endif %} - {% if not build.areUntrackedPartsFullyAllocated %} -
    - {% trans "Stock has not been fully allocated to this Build Order" %} -
    - {% endif %} - {% endif %} -
    -{% endblock %} - -{% block header_pre_content %} - -{% endblock %} - -{% block header_post_content %} - -{% endblock %} - -{% block thumbnail %} - -{% endblock %} - -{% block page_data %} -

    - {% trans "Build Order" %} {{ build }} +{% block heading %} +

    + {% trans "Build Order" %} {% if user.is_staff and roles.build.change %} {% endif %} -

    -

    - {% build_status_label build.status large=True %} - {% if build.is_overdue %} - {% trans "Overdue" %} - {% endif %} -

    -
    -

    {{ build.title }}

    - -
    - -
    - - -
    - - {% if roles.build.change %} -
    - - -
    - {% if build.active %} - - {% endif %} - {% endif %} -
    + {% endblock %} -{% block page_details %} +{% block details_left %} -

    {% trans "Build Details" %}

    +
    + +
    + +
    +
    + +
    + + +
    + + {% if roles.build.change %} +
    + + +
    + {% if build.active %} + + {% endif %} + {% endif %} +
    +
    + + +{% endblock %} + +{% block details_right %} @@ -197,6 +138,57 @@ src="{% static 'img/blank_image.png' %}" {% endif %}
    +
    + {% if build.sales_order %} +
    + {% object_link 'so-detail' build.sales_order.id build.sales_order as link %} + {% blocktrans %}This Build Order is allocated to Sales Order {{link}}{% endblocktrans %} +
    + {% endif %} + + {% if build.parent %} +
    + {% object_link 'build-detail' build.parent.id build.parent as link %} + {% blocktrans %}This Build Order is a child of Build Order {{link}}{% endblocktrans %} +
    + {% endif %} + + {% if build.active %} + {% if build.can_complete %} +
    + {% trans "Build Order is ready to mark as completed" %} +
    + {% endif %} + {% if build.incomplete_count > 0 %} +
    + {% trans "Build Order cannot be completed as outstanding outputs remain" %} +
    + {% endif %} + {% if build.completed < build.quantity %} +
    + {% trans "Required build quantity has not yet been completed" %} +
    + {% endif %} + {% if not build.areUntrackedPartsFullyAllocated %} +
    + {% trans "Stock has not been fully allocated to this Build Order" %} +
    + {% endif %} + {% endif %} +
    +{% endblock %} + +{% block page_data %} +

    + {% build_status_label build.status large=True %} + {% if build.is_overdue %} + {% trans "Overdue" %} + {% endif %} +

    +
    +

    {{ build.title }}

    + + {% endblock %} {% block js_ready %} diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html index f87eec90a0..3e4da8a7c9 100644 --- a/InvenTree/build/templates/build/detail.html +++ b/InvenTree/build/templates/build/detail.html @@ -233,7 +233,7 @@
    -