diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py index 2a8d907b76..e9bb3f69d2 100644 --- a/InvenTree/company/models.py +++ b/InvenTree/company/models.py @@ -423,12 +423,15 @@ class SupplierPart(models.Model): return str(self) def __str__(self): - s = "{supplier} ({sku})".format( - sku=self.SKU, - supplier=self.supplier.name) + s = '' + + if self.part.IPN: + s += f'{self.part.IPN}' + + s += f' | {self.supplier.name} | {self.SKU}' if self.manufacturer_string: - s = s + ' - ' + self.manufacturer_string + s = s + ' | ' + self.manufacturer_string return s diff --git a/InvenTree/company/templates/company/supplier_part_base.html b/InvenTree/company/templates/company/supplier_part_base.html index 383b942346..ca09caee93 100644 --- a/InvenTree/company/templates/company/supplier_part_base.html +++ b/InvenTree/company/templates/company/supplier_part_base.html @@ -94,7 +94,7 @@ src="{% static 'img/blank_image.png' %}" {% block js_ready %} {{ block.super }} -$('#order-part').click(function() { +$('#order-part, #order-part2').click(function() { launchModalForm( "{% url 'order-parts' %}", { diff --git a/InvenTree/company/templates/company/supplier_part_orders.html b/InvenTree/company/templates/company/supplier_part_orders.html index 381a2941e9..5c2ea6d1d4 100644 --- a/InvenTree/company/templates/company/supplier_part_orders.html +++ b/InvenTree/company/templates/company/supplier_part_orders.html @@ -6,18 +6,18 @@ {% include "company/supplier_part_tabs.html" with tab='orders' %} -
-

{% trans "Supplier Part Orders" %}

+
+
-
- -
+
+
+
- -
+ +
{% endblock %} diff --git a/InvenTree/company/templates/company/supplier_part_pricing.html b/InvenTree/company/templates/company/supplier_part_pricing.html index 28cc917e1a..f9f5063190 100644 --- a/InvenTree/company/templates/company/supplier_part_pricing.html +++ b/InvenTree/company/templates/company/supplier_part_pricing.html @@ -7,10 +7,10 @@ {% include "company/supplier_part_tabs.html" with tab='pricing' %} -
-

{% trans "Pricing Information" %}

+
+
diff --git a/InvenTree/company/templates/company/supplier_part_stock.html b/InvenTree/company/templates/company/supplier_part_stock.html index 95c2559977..a9b378e27b 100644 --- a/InvenTree/company/templates/company/supplier_part_stock.html +++ b/InvenTree/company/templates/company/supplier_part_stock.html @@ -6,10 +6,10 @@ {% include "company/supplier_part_tabs.html" with tab='stock' %} -
-

{% trans "Supplier Part Stock" %}

+
+ {% include "stock_table.html" %} {% endblock %} diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html index 642ff96d4a..0c569bdca8 100644 --- a/InvenTree/order/templates/order/purchase_order_detail.html +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -13,7 +13,7 @@
{% if order.status == PurchaseOrderStatus.PENDING and roles.purchase_order.change %} - + {% endif %}