diff --git a/InvenTree/InvenTree/static/script/inventree/build.js b/InvenTree/InvenTree/static/script/inventree/build.js index aa938ecd53..8ec872bbcb 100644 --- a/InvenTree/InvenTree/static/script/inventree/build.js +++ b/InvenTree/InvenTree/static/script/inventree/build.js @@ -71,7 +71,7 @@ function loadAllocationTable(table, part_id, part, url, required, button) { var count = 0; for (var i = 0; i < results.length; i++) { - count += results[i].quantity; + count += parseFloat(results[i].quantity); } updateAllocationTotal(part_id, count, required); diff --git a/InvenTree/build/templates/build/allocation_item.html b/InvenTree/build/templates/build/allocation_item.html index 87b6ba1340..0492e44280 100644 --- a/InvenTree/build/templates/build/allocation_item.html +++ b/InvenTree/build/templates/build/allocation_item.html @@ -18,7 +18,7 @@ {% decimal item.sub_part.total_stock %}
- {% multiply build.quantity item.quantity %} + {% multiply build.quantity item.quantity %}{% if item.overage %} (+ {{ item.overage }}){% endif %}
{% part_allocation_count build item.sub_part %} diff --git a/InvenTree/company/templates/company/supplier_part_base.html b/InvenTree/company/templates/company/supplier_part_base.html index f7e6ce88cc..76f75094f7 100644 --- a/InvenTree/company/templates/company/supplier_part_base.html +++ b/InvenTree/company/templates/company/supplier_part_base.html @@ -21,19 +21,49 @@ InvenTree | {% trans "Supplier Part" %}
- -
- +
+
+

{% trans "Supplier Part Details" %}

+ + + + + + + + {% if part.URL %} + + {% endif %} + {% if part.description %} + + {% endif %} + {% if part.manufacturer %} + + + {% endif %} + {% if part.note %} + + {% endif %} +
{% trans "Internal Part" %} + {% if part.part %} + {{ part.part.full_name }} + {% endif %} +
{% trans "Supplier" %}{{ part.supplier.name }}
{% trans "SKU" %}{{ part.SKU }}
{% trans "URL" %}{{ part.URL }}
{% trans "Description" %}{{ part.description }}
{% trans "Manufacturer" %}{{ part.manufacturer }}
{% trans "MPN" %}{{ part.MPN }}
{% trans "Note" %}{{ part.note }}
+
+ + + +
diff --git a/InvenTree/company/templates/company/supplier_part_tabs.html b/InvenTree/company/templates/company/supplier_part_tabs.html index 0bcd8aa4fa..b3a4389bbd 100644 --- a/InvenTree/company/templates/company/supplier_part_tabs.html +++ b/InvenTree/company/templates/company/supplier_part_tabs.html @@ -1,9 +1,6 @@ {% load i18n %}