From d3b1ecd65e2a0611de9363a1cf8e6af03c6963c2 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Wed, 20 Oct 2021 23:44:01 +1100
Subject: [PATCH] Add "owner" field

---
 InvenTree/stock/serializers.py             | 7 ++++---
 InvenTree/templates/js/translated/stock.js | 7 ++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/InvenTree/stock/serializers.py b/InvenTree/stock/serializers.py
index e2781af12f..0b99ed9c02 100644
--- a/InvenTree/stock/serializers.py
+++ b/InvenTree/stock/serializers.py
@@ -58,15 +58,15 @@ class StockItemSerializerBrief(InvenTreeModelSerializer):
     class Meta:
         model = StockItem
         fields = [
-            'pk',
-            'uid',
             'part',
             'part_name',
-            'supplier_part',
+            'pk',
             'location',
             'location_name',
             'quantity',
             'serial',
+            'supplier_part',
+            'uid',
         ]
 
 
@@ -208,6 +208,7 @@ class StockItemSerializer(InvenTreeModelSerializer):
             'location',
             'location_detail',
             'notes',
+            'owner',
             'packaging',
             'part',
             'part_detail',
diff --git a/InvenTree/templates/js/translated/stock.js b/InvenTree/templates/js/translated/stock.js
index 2f885477a5..2bc562cb5a 100644
--- a/InvenTree/templates/js/translated/stock.js
+++ b/InvenTree/templates/js/translated/stock.js
@@ -94,8 +94,8 @@ function stockItemFields(options={}) {
         purchase_price_currency: {},
         packaging: {},
         link: {},
+        owner: {},
         delete_on_deplete: {},
-        // owner: {},
     };
 
     // Remove stock expiry fields if feature is not enabled
@@ -103,6 +103,11 @@ function stockItemFields(options={}) {
         delete fields['expiry_date'];
     }
 
+    // Remove ownership field if feature is not enanbled
+    if (!global_settings.STOCK_OWNERSHIP_CONTROL) {
+        delete fields['owner'];
+    }
+
     return fields;
 }