From 39d44ce32feaf90226af1d36a8dde239f05ce877 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Wed, 10 Mar 2021 16:19:44 +1100
Subject: [PATCH 1/2] Add "responsible" field to PO and SO models

---
 .../migrations/0042_auto_20210310_1619.py     | 25 +++++++++++++++++++
 InvenTree/order/models.py                     | 12 ++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 InvenTree/order/migrations/0042_auto_20210310_1619.py

diff --git a/InvenTree/order/migrations/0042_auto_20210310_1619.py b/InvenTree/order/migrations/0042_auto_20210310_1619.py
new file mode 100644
index 0000000000..9d07bc18f3
--- /dev/null
+++ b/InvenTree/order/migrations/0042_auto_20210310_1619.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.0.7 on 2021-03-10 05:19
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0005_owner_model'),
+        ('order', '0041_auto_20210114_1728'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='purchaseorder',
+            name='responsible',
+            field=models.ForeignKey(blank=True, help_text='User or group responsible for this order', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='users.Owner', verbose_name='Responsible'),
+        ),
+        migrations.AddField(
+            model_name='salesorder',
+            name='responsible',
+            field=models.ForeignKey(blank=True, help_text='User or group responsible for this order', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='users.Owner', verbose_name='Responsible'),
+        ),
+    ]
diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py
index d4d90b4d93..c3b33eaace 100644
--- a/InvenTree/order/models.py
+++ b/InvenTree/order/models.py
@@ -21,6 +21,7 @@ from markdownx.models import MarkdownxField
 
 from djmoney.models.fields import MoneyField
 
+from users import models as UserModels
 from part import models as PartModels
 from stock import models as stock_models
 from company.models import Company, SupplierPart
@@ -46,7 +47,7 @@ class Order(models.Model):
         created_by: User who created this order (automatically captured)
         issue_date: Date the order was issued
         complete_date: Date the order was completed
-
+        responsible: User (or group) responsible for managing the order
     """
 
     @classmethod
@@ -109,6 +110,15 @@ class Order(models.Model):
                                    related_name='+'
                                    )
 
+    responsible = models.ForeignKey(
+        UserModels.Owner,
+        on_delete=models.SET_NULL,
+        blank=True, null=True,
+        help_text=_('User or group responsible for this order'),
+        verbose_name=_('Responsible'),
+        related_name='+',
+    )
+
     notes = MarkdownxField(blank=True, help_text=_('Order notes'))
 
 

From d559d92f589b5b342a657047b5c16481367133b3 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Wed, 10 Mar 2021 16:26:20 +1100
Subject: [PATCH 2/2] Display responsible owner for salesorder and
 purchaseorder

---
 InvenTree/order/forms.py                              | 4 +++-
 InvenTree/order/templates/order/order_base.html       | 7 +++++++
 InvenTree/order/templates/order/sales_order_base.html | 7 +++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/InvenTree/order/forms.py b/InvenTree/order/forms.py
index 808ab7ed29..b5edec386a 100644
--- a/InvenTree/order/forms.py
+++ b/InvenTree/order/forms.py
@@ -116,6 +116,7 @@ class EditPurchaseOrderForm(HelperForm):
             'description',
             'target_date',
             'link',
+            'responsible',
         ]
 
 
@@ -148,7 +149,8 @@ class EditSalesOrderForm(HelperForm):
             'customer_reference',
             'description',
             'target_date',
-            'link'
+            'link',
+            'responsible',
         ]
 
 
diff --git a/InvenTree/order/templates/order/order_base.html b/InvenTree/order/templates/order/order_base.html
index ed90e1f049..b4761f6a69 100644
--- a/InvenTree/order/templates/order/order_base.html
+++ b/InvenTree/order/templates/order/order_base.html
@@ -129,6 +129,13 @@ src="{% static 'img/blank_image.png' %}"
         <td>{{ order.complete_date }}<span class='badge'>{{ order.received_by }}</span></td>
     </tr>
     {% endif %}
+    {% if order.responsible %}
+    <tr>
+        <td><span class='fas fa-users'></span></td>
+        <td>{% trans "Responsible" %}</td>
+        <td>{{ order.responsible }}</td>
+    </tr>
+    {% endif %}
 </table>
 {% endblock %}
 
diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html
index d671154529..17db37927c 100644
--- a/InvenTree/order/templates/order/sales_order_base.html
+++ b/InvenTree/order/templates/order/sales_order_base.html
@@ -129,6 +129,13 @@ src="{% static 'img/blank_image.png' %}"
         <td>{{ order.complete_date }}<span class='badge'>{{ order.received_by }}</span></td>
     </tr>
     {% endif %}
+    {% if order.responsible %}
+    <tr>
+        <td><span class='fas fa-users'></span></td>
+        <td>{% trans "Responsible" %}</td>
+        <td>{{ order.responsible }}</td>
+    </tr>
+    {% endif %}
 </table>
 {% endblock %}