From b89002a4503297460c77334e415e7cafb4a39ab8 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 2 May 2020 20:10:00 +1000
Subject: [PATCH 1/4] Add button to order a supplier part

---
 .../templates/company/supplier_part_base.html     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/InvenTree/company/templates/company/supplier_part_base.html b/InvenTree/company/templates/company/supplier_part_base.html
index 5a3d49a10e..383b942346 100644
--- a/InvenTree/company/templates/company/supplier_part_base.html
+++ b/InvenTree/company/templates/company/supplier_part_base.html
@@ -20,6 +20,9 @@ src="{% static 'img/blank_image.png' %}"
 <p>{{ part.supplier.name }} - {{ part.SKU }}</p>
 <div class='btn-row'>
     <div class='btn-group action-buttons' role='group'>
+        <button type='button' class='btn btn-default btn-glyph' id='order-part' title='{% trans "Order part" %}'>
+            <span class='fas fa-shopping-cart'></span>
+        </button>
         <button type='button' class='btn btn-default btn-glyph' id='edit-part' title='{% trans "Edit supplier part" %}'>
             <span class='fas fa-edit icon-green'/>
         </button>
@@ -91,6 +94,18 @@ src="{% static 'img/blank_image.png' %}"
 {% block js_ready %}
 {{ block.super }}
 
+$('#order-part').click(function() {
+    launchModalForm(
+        "{% url 'order-parts' %}",
+        {
+            data: {
+                part: {{ part.part.id }},
+            },
+            reload: true,
+        },
+    );
+});
+
 $('#edit-part').click(function () {
     launchModalForm(
                     "{% url 'supplier-part-edit' part.id %}",

From 0199760e1cd74371d00cab82c9b082f58b5d195d Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 2 May 2020 20:10:12 +1000
Subject: [PATCH 2/4] Bug fix

---
 InvenTree/part/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index 6f6b0d7ddf..90383ab26f 100644
--- a/InvenTree/part/models.py
+++ b/InvenTree/part/models.py
@@ -526,7 +526,7 @@ class Part(models.Model):
         This number (unlike 'available_stock') can be negative.
         """
 
-        return self.total_stock - self.allocation_count + self.on_order
+        return self.total_stock - self.allocation_count() + self.on_order
 
     def isStarredBy(self, user):
         """ Return True if this part has been starred by a particular user """

From 26f0338f1d30180fc5a9bdfbab9f642e09935305 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 2 May 2020 20:25:47 +1000
Subject: [PATCH 3/4] Auto-select a purchase order when ordering parts

---
 InvenTree/order/views.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py
index e68dca16ae..2459f83abf 100644
--- a/InvenTree/order/views.py
+++ b/InvenTree/order/views.py
@@ -766,6 +766,7 @@ class OrderParts(AjaxView):
 
         for supplier in self.suppliers:
             supplier.order_items = []
+            
             suppliers[supplier.name] = supplier
 
         for part in self.parts:
@@ -778,7 +779,15 @@ class OrderParts(AjaxView):
 
             if supplier.name not in suppliers:
                 supplier.order_items = []
-                supplier.selected_purchase_order = None
+
+                # Attempt to auto-select a purchase order
+                orders = PurchaseOrder.objects.filter(supplier=supplier, status__in=PurchaseOrderStatus.OPEN)
+
+                if orders.count() == 1:
+                    supplier.selected_purchase_order = orders.first().id
+                else:
+                    supplier.selected_purchase_order = None
+    
                 suppliers[supplier.name] = supplier
                 
             suppliers[supplier.name].order_items.append(part)

From b39283a18f2bce3e63345b612db55a94a883663d Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 2 May 2020 20:29:20 +1000
Subject: [PATCH 4/4] Separate allocation counters

---
 InvenTree/part/templates/part/part_base.html | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 4da8ec7ffe..0bb3687fc8 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -108,11 +108,18 @@
             <td>{% include "part/stock_count.html" %}</td>
         </tr>
         {% if not part.is_template %}
-        {% if part.allocation_count > 0 %}
+        {% if part.build_order_allocation_count > 0 %}
         <tr>
             <td><span class='fas fa-dolly'></span></td>
-            <td>{% trans "Allocated" %}</td>
-            <td>{% decimal part.allocation_count %}</td>
+            <td>{% trans "Allocated to Build Orders" %}</td>
+            <td>{% decimal part.build_order_allocation_count %}</td>
+        </tr>
+        {% endif %}
+        {% if part.sales_order_allocation_count > 0 %}
+        <tr>
+            <td><span class='fas fa-dolly'></span></td>
+            <td>{% trans "Allocated to Sales Orders" %}</td>
+            <td>{% decimal part.sales_order_allocation_count %}</td>
         </tr>
         {% endif %}
         {% if part.on_order > 0 %}