diff --git a/InvenTree/build/forms.py b/InvenTree/build/forms.py index 5ef3579f89..74227adb9c 100644 --- a/InvenTree/build/forms.py +++ b/InvenTree/build/forms.py @@ -28,7 +28,6 @@ class EditBuildForm(HelperForm): 'reference': _('Build Order reference') } - class Meta: model = Build fields = [ diff --git a/InvenTree/build/models.py b/InvenTree/build/models.py index 4fdbc6afc9..40666d5fce 100644 --- a/InvenTree/build/models.py +++ b/InvenTree/build/models.py @@ -22,7 +22,7 @@ from markdownx.models import MarkdownxField from mptt.models import MPTTModel, TreeForeignKey from InvenTree.status_codes import BuildStatus -from InvenTree.helpers import decimal2string, increment +from InvenTree.helpers import increment import InvenTree.fields from stock import models as StockModels diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html index f076013def..68fd28101d 100644 --- a/InvenTree/build/templates/build/build_base.html +++ b/InvenTree/build/templates/build/build_base.html @@ -5,18 +5,18 @@ {% load status_codes %} {% block page_title %} -InvenTree | {% trans "Build" %} - {{ build }} +InvenTree | {% trans "Build Order" %} - {{ build }} {% endblock %} {% block pre_content %} {% if build.sales_order %}
- {% trans "This build is allocated to Sales Order" %} {{ build.sales_order }} + {% trans "This Build Order is allocated to Sales Order" %} {{ build.sales_order }}
{% endif %} {% if build.parent %}
- {% trans "This build is a child of Build" %} {{ build.parent }} + {% trans "This Build Order is a child of Build Order" %} {{ build.parent }}
{% endif %} {% endblock %} @@ -31,14 +31,15 @@ src="{% static 'img/blank_image.png' %}" {% endblock %} {% block page_data %} -

{% trans "Build" %} {% build_status_label build.status large=True %}

-
-

- {{ build.quantity }} x {{ build.part.full_name }} +

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

+ {% endif %} + +

{% build_status_label build.status large=True %}

+
+

{{ build.title }}

{% if roles.build.change %} @@ -68,9 +69,9 @@ src="{% static 'img/blank_image.png' %}"

{% trans "Build Details" %}

- - - + + + diff --git a/InvenTree/order/templates/order/order_base.html b/InvenTree/order/templates/order/order_base.html index 3b199c1840..d3e1e02437 100644 --- a/InvenTree/order/templates/order/order_base.html +++ b/InvenTree/order/templates/order/order_base.html @@ -20,46 +20,44 @@ src="{% static 'img/blank_image.png' %}" {% endblock %} {% block page_data %} -

{% trans "Purchase Order" %} {% purchase_order_status_label order.status large=True %}

-
-

- {{ order }} +

+ {% trans "Purchase Order" %} {{ order.reference }} {% if user.is_staff and roles.purchase_order.change %} {% endif %} -

+ +

{% purchase_order_status_label order.status large=True %}

+

{{ order.description }}

-

-

-
- {% if roles.purchase_order.change %} - - {% if order.status == PurchaseOrderStatus.PENDING and order.lines.count > 0 %} - - {% elif order.status == PurchaseOrderStatus.PLACED %} - - - {% endif %} - {% if order.status == PurchaseOrderStatus.PENDING or order.status == PurchaseOrderStatus.PLACED %} - - {% endif %} - {% endif %} - -
+
+
+ {% if roles.purchase_order.change %} + + {% if order.status == PurchaseOrderStatus.PENDING and order.lines.count > 0 %} + + {% elif order.status == PurchaseOrderStatus.PLACED %} + + + {% endif %} + {% if order.status == PurchaseOrderStatus.PENDING or order.status == PurchaseOrderStatus.PLACED %} + + {% endif %} + {% endif %} +
-

+
{% endblock %} {% block page_details %} diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html index 2eb13eaa64..59ff0eeda8 100644 --- a/InvenTree/order/templates/order/sales_order_base.html +++ b/InvenTree/order/templates/order/sales_order_base.html @@ -27,17 +27,18 @@ src="{% static 'img/blank_image.png' %}" /> {% endblock %} - {% block page_data %} -

{% trans "Sales Order" %} {% sales_order_status_label order.status large=True %}

-
-

- {{ order }} +

+ {% trans "Sales Order" %} {{ order.reference }} {% if user.is_staff and roles.sales_order.change %} {% endif %} -

+ +

+ {% sales_order_status_label order.status large=True %} +

+

{{ order.description }}

{% trans "Build Title" %}{{ build.title }}{% trans "Build Order Reference" %}{{ build.reference }}