Merge pull request #1047 from eeintech/add_ipn_supplier_part_str

Added IPN to Supplier Part string representation (global)

InvenTree/company/models.py

@@ -423,12 +423,16 @@ class SupplierPart(models.Model):
         return str(self)
 
     def __str__(self):
-        s = "{supplier} ({sku})".format(
+        s = ''
-            sku=self.SKU,
+
-            supplier=self.supplier.name)
+        if self.part.IPN:
+            s += f'{self.part.IPN}'
+            s += ' | '
+
+        s += f'{self.supplier.name} | {self.SKU}'
 
         if self.manufacturer_string:
-            s = s + ' - ' + self.manufacturer_string
+            s = s + ' | ' + self.manufacturer_string
         
         return s
 

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' %}",
         {

InvenTree/company/templates/company/supplier_part_orders.html

@@ -6,18 +6,18 @@
 
 {% include "company/supplier_part_tabs.html" with tab='orders' %}
 
-<hr>
-
 <h4>{% trans "Supplier Part Orders" %}</h4>
 
+<hr>
+
 <div id='button-bar'>
-        <div class='btn-group'>
+    <div class='btn-group'>
-            <button class='btn btn-primary' type='button' id='part-order2' title='Order part'>Order Part</button>
+        <button class='btn btn-primary' type='button' id='order-part2' title='Order part'>Order Part</button>
-        </div>
     </div>
+</div>
     
-    <table class='table table-striped table-condensed po-table' id='purchase-order-table' data-toolbar='#button-bar'>
+<table class='table table-striped table-condensed po-table' id='purchase-order-table' data-toolbar='#button-bar'>
-    </table>
+</table>
 
 {% endblock %}
 

InvenTree/company/templates/company/supplier_part_pricing.html

@@ -7,10 +7,10 @@
 
 {% include "company/supplier_part_tabs.html" with tab='pricing' %}
 
-<hr>
-
 <h4>{% trans "Pricing Information" %}</h4>
 
+<hr>
+
 <div id='price-break-toolbar' class='btn-group'>
     <button class='btn btn-primary' id='new-price-break' type='button'>{% trans "Add Price Break" %}</button>
 </div>

InvenTree/company/templates/company/supplier_part_stock.html

@@ -6,10 +6,10 @@
 
 {% include "company/supplier_part_tabs.html" with tab='stock' %}
 
-<hr>
-
 <h4>{% trans "Supplier Part Stock" %}</h4>
 
+<hr>
+
 {% include "stock_table.html" %}
 
 {% endblock %}

InvenTree/order/templates/order/purchase_order_detail.html

@@ -13,7 +13,7 @@
 
 <div id='order-toolbar-buttons' class='btn-group' style='float: right;'>
     {% if order.status == PurchaseOrderStatus.PENDING and roles.purchase_order.change %}
-    <button type='button' class='btn btn-default' id='new-po-line'>{% trans "Add Line Item" %}</button>
+    <button type='button' class='btn btn-primary' id='new-po-line'>{% trans "Add Line Item" %}</button>
     {% endif %}
 </div>