Merge remote-tracking branch 'inventree/master' into drf-api-forms

InvenTree/templates/js/stock.js

@@ -685,6 +685,20 @@ function loadStockTable(table, options) {
                     return renderLink(text, link);
                 }
             },
+            {
+                field: 'supplier_part',
+                title: '{% trans "Supplier Part" %}',
+                formatter: function(value, row) {
+                    if (!value) {
+                        return '-';
+                    }
+
+                    var link = `/supplier-part/${row.supplier_part}/stock/`;
+                    var text = `${row.supplier_part_detail.SKU}`;
+
+                    return renderLink(text, link);
+                }
+            },
             {
                 field: 'purchase_price',
                 title: '{% trans "Purchase Price" %}',

InvenTree/templates/js/table_filters.js

@@ -205,7 +205,12 @@ function getAvailableTableFilters(tableKey) {
             batch: {
                 title: '{% trans "Batch" %}',
                 description: '{% trans "Batch code" %}',
-            }
+            },
+            has_purchase_price: {
+                type: 'bool',
+                title: '{% trans "Has purchase price" %}',
+                description: '{% trans "Show stock items which have a purchase price set" %}',
+            },
         };
     }
 

InvenTree/templates/stats.html

@@ -63,7 +63,7 @@
         <td>{% trans "Email Settings" %}</td>
         <td>
             <a href='https://inventree.readthedocs.io/en/latest/admin/email'>
-                <span class='label label-red'>{% trans "Email settings not configured" %}</span>
+                <span class='label label-yellow'>{% trans "Email settings not configured" %}</span>
             </a>
         </td>
     </tr>