Merge remote-tracking branch 'inventree/master' into batch-reports

# Conflicts:
#	InvenTree/templates/stock_table.html

InvenTree/InvenTree/settings.py

@@ -22,7 +22,28 @@ from django.utils.translation import gettext_lazy as _
 
 
 def _is_true(x):
-    return x in [True, "True", "true", "Y", "y", "1"]
+    # Shortcut function to determine if a value "looks" like a boolean
+    return str(x).lower() in ['1', 'y', 'yes', 't', 'true']
+
+
+def get_setting(environment_var, backup_val, default_value=None):
+    """
+    Helper function for retrieving a configuration setting value
+
+    - First preference is to look for the environment variable
+    - Second preference is to look for the value of the settings file
+    - Third preference is the default value
+    """
+
+    val = os.getenv(environment_var)
+
+    if val is not None:
+        return val
+
+    if backup_val is not None:
+        return backup_val
+
+    return default_value
 
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -39,10 +60,17 @@ with open(cfg_filename, 'r') as cfg:
 
 # Default action is to run the system in Debug mode
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = _is_true(os.getenv("INVENTREE_DEBUG", CONFIG.get("debug", True)))
+DEBUG = _is_true(get_setting(
+    'INVENTREE_DEBUG',
+    CONFIG.get('debug', True)
+))
 
 # Configure logging settings
-log_level = CONFIG.get('log_level', 'DEBUG').upper()
+log_level = get_setting(
+    'INVENTREE_LOG_LEVEL',
+    CONFIG.get('log_level', 'DEBUG')
+)
+
 logging.basicConfig(
     level=log_level,
     format="%(asctime)s %(levelname)s %(message)s",
@@ -75,6 +103,7 @@ if os.getenv("INVENTREE_SECRET_KEY"):
 else:
     # Secret key passed in by file location
     key_file = os.getenv("INVENTREE_SECRET_KEY_FILE")
+
     if key_file:
         if os.path.isfile(key_file):
             logger.info("SECRET_KEY loaded by INVENTREE_SECRET_KEY_FILE")
@@ -112,7 +141,12 @@ if cors_opt:
 STATIC_URL = '/static/'
 
 # The filesystem location for served static files
-STATIC_ROOT = os.path.abspath(CONFIG.get('static_root', os.path.join(BASE_DIR, 'static')))
+STATIC_ROOT = os.path.abspath(
+    get_setting(
+        'INVENTREE_STATIC_ROOT',
+        CONFIG.get('static_root', os.path.join(BASE_DIR, 'static'))
+    )
+)
 
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, 'InvenTree', 'static'),
@@ -125,7 +159,12 @@ STATIC_COLOR_THEMES_DIR = os.path.join(STATIC_ROOT, 'css', 'color-themes')
 MEDIA_URL = '/media/'
 
 # The filesystem location for served static files
-MEDIA_ROOT = os.path.abspath(CONFIG.get('media_root', os.path.join(BASE_DIR, 'media')))
+MEDIA_ROOT = os.path.abspath(
+    get_setting(
+        'INVENTREE_MEDIA_ROOT',
+        CONFIG.get('media_root', os.path.join(BASE_DIR, 'media'))
+    )
+)
 
 if DEBUG:
     logger.info("InvenTree running in DEBUG mode")
@@ -133,30 +172,6 @@ if DEBUG:
 logger.info(f"MEDIA_ROOT: '{MEDIA_ROOT}'")
 logger.info(f"STATIC_ROOT: '{STATIC_ROOT}'")
 
-# Does the user wish to use the sentry.io integration?
-sentry_opts = CONFIG.get('sentry', {})
-
-if sentry_opts.get('enabled', False):
-
-    logger.info("Configuring sentry.io integration")
-
-    dsn = sentry_opts.get('dsn', None)
-
-    if dsn is not None:
-        # Try to import required modules (exit if not installed)
-        try:
-            import sentry_sdk
-            from sentry_sdk.integrations.django import DjangoIntegration
-
-            sentry_sdk.init(dsn=dsn, integrations=[DjangoIntegration()], send_default_pii=True)
-
-        except ModuleNotFoundError:
-            logger.error("sentry_sdk module not found. Install using 'pip install sentry-sdk'")
-            sys.exit(-1)
-
-    else:
-        logger.warning("Sentry.io DSN not specified in config file")
-
 # Application definition
 
 INSTALLED_APPS = [
@@ -430,16 +445,17 @@ if not type(EXTRA_URL_SCHEMES) in [list]:
     EXTRA_URL_SCHEMES = []
 
 # Internationalization
-# https://docs.djangoproject.com/en/1.10/topics/i18n/
+# https://docs.djangoproject.com/en/dev/topics/i18n/
 
 LANGUAGE_CODE = CONFIG.get('language', 'en-us')
 
 # If a new language translation is supported, it must be added here
 LANGUAGES = [
     ('en', _('English')),
-    ('de', _('German')),
     ('fr', _('French')),
+    ('de', _('German')),
     ('pk', _('Polish')),
+    ('tr', _('Turkish')),
 ]
 
 # Currencies available for use
@@ -491,10 +507,15 @@ CRISPY_TEMPLATE_PACK = 'bootstrap3'
 # Use database transactions when importing / exporting data
 IMPORT_EXPORT_USE_TRANSACTIONS = True
 
+BACKUP_DIR = get_setting(
+    'INVENTREE_BACKUP_DIR',
+    CONFIG.get('backup_dir', tempfile.gettempdir()),
+)
+
 # Settings for dbbsettings app
 DBBACKUP_STORAGE = 'django.core.files.storage.FileSystemStorage'
 DBBACKUP_STORAGE_OPTIONS = {
-    'location': CONFIG.get('backup_dir', tempfile.gettempdir()),
+    'location': BACKUP_DIR,
 }
 
 # Internal IP addresses allowed to see the debug toolbar

InvenTree/common/models.py

@@ -196,6 +196,13 @@ class InvenTreeSetting(models.Model):
             'validator': bool,
         },
 
+        'STOCK_OWNERSHIP_CONTROL': {
+            'name': _('Stock Ownership Control'),
+            'description': _('Enable ownership control over stock locations and items'),
+            'default': False,
+            'validator': bool,
+        },
+
         'BUILDORDER_REFERENCE_PREFIX': {
             'name': _('Build Order Reference Prefix'),
             'description': _('Prefix value for build order reference'),

InvenTree/config_template.yaml

@@ -107,13 +107,6 @@ static_root: '../inventree_static'
 # If unspecified, the local user's temp directory will be used
 #backup_dir: '/home/inventree/backup/'
 
-# Sentry.io integration
-# If you have a sentry.io account, it can be used to log server errors
-# Ensure sentry_sdk is installed by running 'pip install sentry-sdk'
-sentry:
-  enabled: False
-  # dsn: add-your-sentry-dsn-here
-
 # LaTeX report rendering
 # InvenTree uses the django-tex plugin to enable LaTeX report rendering
 # Ref: https://pypi.org/project/django-tex/

InvenTree/part/templatetags/inventree_extras.py

@@ -145,3 +145,22 @@ def get_color_theme_css(username):
     inventree_css_static_url = os.path.join(settings.STATIC_URL, inventree_css_sheet)
 
     return inventree_css_static_url
+
+
+@register.simple_tag()
+def authorized_owners(group):
+    """ Return authorized owners """
+
+    owners = []
+
+    try:
+        for owner in group.get_related_owners(include_group=True):
+            owners.append(owner.owner)
+    except AttributeError:
+        # group is None
+        pass
+    except TypeError:
+        # group.get_users returns None
+        pass
+    
+    return owners

InvenTree/script/translate.py

@@ -28,8 +28,10 @@ def manually_translate_file(filename, save=False):
     print("For each missing translation:")
     print("a) Directly enter a new tranlation in the target language")
     print("b) Leave empty to skip")
+    print("c) Press Ctrl+C to exit")
     
-    input("Press <ENTER> to continue")
+    print("-------------------------")
+    input("Press <ENTER> to start")
     print("")
 
     with open(filename, 'r') as f:
@@ -58,7 +60,10 @@ def manually_translate_file(filename, save=False):
                 print("Source:", source_line)
                 print("Enter translation for {t}".format(t=msgid))
 
-                translation = str(input(">"))
+                try:
+                    translation = str(input(">"))
+                except KeyboardInterrupt:
+                    break
 
                 if translation and len(translation) > 0:
                     # Update the line with the new translation
@@ -71,7 +76,7 @@ def manually_translate_file(filename, save=False):
             output_file.writelines(out)
 
         print("Translation done: written to", filename)
-        print("Run 'make translate' to rebuild translation data")
+        print("Run 'invoke translate' to rebuild translation data")
 
 
 if __name__ == '__main__':

InvenTree/script/translation_stats.py

@@ -0,0 +1,68 @@
+"""
+This script calculates translation coverage for various languages
+"""
+
+import os
+
+
+def calculate_coverage(filename):
+    """
+    Calculate translation coverage for a .po file
+    """
+
+    with open(filename, 'r') as f:
+        lines = f.readlines()
+
+    lines_count = 0
+    lines_covered = 0
+    lines_uncovered = 0
+
+    for line in lines:
+
+        if line.startswith("msgid "):
+            lines_count += 1
+
+        elif line.startswith("msgstr"):
+            if line.startswith('msgstr ""') or line.startswith("msgstr ''"):
+                lines_uncovered += 1
+            else:
+                lines_covered += 1
+
+    # Return stats for the file
+    return (lines_count, lines_covered, lines_uncovered)
+
+
+if __name__ == '__main__':
+
+    MY_DIR = os.path.dirname(os.path.realpath(__file__))
+    LC_DIR = os.path.abspath(os.path.join(MY_DIR, '..', 'locale'))
+
+    locales = {}
+
+    print("InvenTree translation coverage:")
+
+    for locale in os.listdir(LC_DIR):
+        path = os.path.join(LC_DIR, locale)
+        if os.path.exists(path) and os.path.isdir(path):
+
+            locale_file = os.path.join(path, 'LC_MESSAGES', 'django.po')
+
+            if os.path.exists(locale_file) and os.path.isfile(locale_file):
+                locales[locale] = locale_file
+
+    print("-" * 16)
+
+    for locale in locales.keys():
+        locale_file = locales[locale]
+        stats = calculate_coverage(locale_file)
+
+        (total, covered, uncovered) = stats
+
+        if total > 0:
+            percentage = int(covered / total * 100)
+        else:
+            percentage = 0
+
+        print(f"| {locale.ljust(4, ' ')} : {str(percentage).rjust(4, ' ')}% |")
+    
+    print("-" * 16)

InvenTree/stock/fixtures/stock.yaml

@@ -25,6 +25,18 @@
     lft: 0
     rght: 0
 
+# Capacitor C_22N_0805 in 'Office'
+- model: stock.stockitem
+  pk: 11
+  fields:
+    part: 5
+    location: 4
+    quantity: 666
+    level: 0
+    tree_id: 0
+    lft: 0
+    rght: 0
+
 # 1234 2K2 resistors in 'Drawer_1'
 - model: stock.stockitem
   pk: 1234

InvenTree/stock/forms.py

@@ -90,7 +90,8 @@ class EditStockLocationForm(HelperForm):
         fields = [
             'name',
             'parent',
-            'description'
+            'description',
+            'owner',
         ]
 
 
@@ -138,6 +139,7 @@ class CreateStockItemForm(HelperForm):
             'link',
             'delete_on_deplete',
             'status',
+            'owner',
         ]
 
     # Custom clean to prevent complex StockItem.clean() logic from running (yet)
@@ -414,6 +416,7 @@ class EditStockItemForm(HelperForm):
             'purchase_price',
             'link',
             'delete_on_deplete',
+            'owner',
         ]
 
 

InvenTree/stock/migrations/0057_stock_location_item_owner.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.0.7 on 2021-01-11 21:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0005_owner_model'),
+        ('stock', '0056_stockitem_expiry_date'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='stockitem',
+            name='owner',
+            field=models.ForeignKey(blank=True, help_text='Select Owner', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='stock_items', to='users.Owner'),
+        ),
+        migrations.AddField(
+            model_name='stocklocation',
+            name='owner',
+            field=models.ForeignKey(blank=True, help_text='Select Owner', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='stock_locations', to='users.Owner'),
+        ),
+    ]

InvenTree/stock/models.py

@@ -38,6 +38,8 @@ from InvenTree.status_codes import StockStatus
 from InvenTree.models import InvenTreeTree, InvenTreeAttachment
 from InvenTree.fields import InvenTreeURLField
 
+from users.models import Owner
+
 from company import models as CompanyModels
 from part import models as PartModels
 
@@ -48,6 +50,10 @@ class StockLocation(InvenTreeTree):
     Stock locations can be heirarchical as required
     """
 
+    owner = models.ForeignKey(Owner, on_delete=models.SET_NULL, blank=True, null=True,
+                              help_text='Select Owner',
+                              related_name='stock_locations')
+
     def get_absolute_url(self):
         return reverse('stock-location-detail', kwargs={'pk': self.id})
 
@@ -489,6 +495,10 @@ class StockItem(MPTTModel):
         help_text=_('Single unit purchase price at time of purchase'),
     )
 
+    owner = models.ForeignKey(Owner, on_delete=models.SET_NULL, blank=True, null=True,
+                              help_text='Select Owner',
+                              related_name='stock_items')
+
     def is_stale(self):
         """
         Returns True if this Stock item is "stale".

InvenTree/stock/templates/stock/item.html

@@ -8,17 +8,25 @@
 
 {% include "stock/tabs.html" with tab="tracking" %}
 
+{% setting_object 'STOCK_OWNERSHIP_CONTROL' as owner_control %}
+{% if owner_control.value == "True" %}
+    {% authorized_owners item.owner as owners %}
+{% endif %}
+
 <h4>{% trans "Stock Tracking Information" %}</h4>
 <hr>
 
-{% if roles.stock.change %}
+<!-- Check permissions and owner -->
-<div id='table-toolbar'>  
+{% if owner_control.value == "False" or owner_control.value == "True" and user in owners %}
-    <div class='btn-group'>
+    {% if roles.stock.change and not item.is_building %}
-        <button class='btn btn-success' type='button' title='New tracking entry' id='new-entry'>
+    <div id='table-toolbar'>  
-            <span class='fas fa-plus-circle'></span> {% trans "New Entry" %}
+        <div class='btn-group'>
-        </button>
+            <button class='btn btn-success' type='button' title='New tracking entry' id='new-entry'>
+                <span class='fas fa-plus-circle'></span> {% trans "New Entry" %}
+            </button>
+        </div>
     </div>
-</div>
+    {% endif %}
 {% endif %}
 <table class='table table-condensed table-striped' id='track-table' data-toolbar='#table-toolbar'>
 </table>

InvenTree/stock/templates/stock/item_base.html

@@ -15,6 +15,17 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
 {% block pre_content %}
 {% include 'stock/loc_link.html' with location=item.location %}
 
+{% setting_object 'STOCK_OWNERSHIP_CONTROL' as owner_control %}
+{% if owner_control.value == "True" %}
+    {% authorized_owners item.owner as owners %}
+
+    {% if not user in owners and not user.is_superuser %}
+    <div class='alert alert-block alert-info'>
+        {% trans "You are not in the list of owners of this item. This stock item cannot be edited." %}<br>
+    </div>
+    {% endif %}
+{% endif %}
+
 {% if item.is_building %}
 <div class='alert alert-block alert-info'>
     {% trans "This stock item is in production and cannot be edited." %}<br>
@@ -68,6 +79,12 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
 {% endblock %}
 
 {% block page_data %}
+
+{% setting_object 'STOCK_OWNERSHIP_CONTROL' as owner_control %}
+{% if owner_control.value == "True" %}
+    {% authorized_owners item.owner as owners %}
+{% endif %}
+
 <h3>
     {% trans "Stock Item" %}
     {% if item.is_expired %}
@@ -132,54 +149,57 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
     </div>
     {% endif %}
     <!-- Stock adjustment menu -->
-    {% if roles.stock.change and not item.is_building %}
+    <!-- Check permissions and owner -->
-    <div class='btn-group'>
+    {% if owner_control.value == "False" or owner_control.value == "True" and user in owners or user.is_superuser %}
-        <button id='stock-actions' title='{% trans "Stock adjustment actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
+        {% if roles.stock.change and not item.is_building %}
-        <ul class='dropdown-menu' role='menu'>
+        <div class='btn-group'>
-            {% if item.in_stock %}
+            <button id='stock-actions' title='{% trans "Stock adjustment actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
-            {% if not item.serialized %}
+            <ul class='dropdown-menu' role='menu'>
-            <li><a href='#' id='stock-count' title='{% trans "Count stock" %}'><span class='fas fa-clipboard-list'></span> {% trans "Count stock" %}</a></li>
+                {% if item.in_stock %}
-            <li><a href='#' id='stock-add' title='{% trans "Add stock" %}'><span class='fas fa-plus-circle icon-green'></span> {% trans "Add stock" %}</a></li>
+                {% if not item.serialized %}
-            <li><a href='#' id='stock-remove' title='{% trans "Remove stock" %}'><span class='fas fa-minus-circle icon-red'></span> {% trans "Remove stock" %}</a></li>
+                <li><a href='#' id='stock-count' title='{% trans "Count stock" %}'><span class='fas fa-clipboard-list'></span> {% trans "Count stock" %}</a></li>
-            {% endif %}
+                <li><a href='#' id='stock-add' title='{% trans "Add stock" %}'><span class='fas fa-plus-circle icon-green'></span> {% trans "Add stock" %}</a></li>
-            <li><a href='#' id='stock-move' title='{% trans "Transfer stock" %}'><span class='fas fa-exchange-alt icon-blue'></span> {% trans "Transfer stock" %}</a></li>
+                <li><a href='#' id='stock-remove' title='{% trans "Remove stock" %}'><span class='fas fa-minus-circle icon-red'></span> {% trans "Remove stock" %}</a></li>
-            {% if item.part.trackable and not item.serialized %}
-            <li><a href='#' id='stock-serialize' title='{% trans "Serialize stock" %}'><span class='fas fa-hashtag'></span> {% trans "Serialize stock" %}</a> </li>
-            {% endif %}
-            {% endif %}
-            {% if item.part.salable and not item.customer %}
-            <li><a href='#' id='stock-assign-to-customer' title='{% trans "Assign to customer" %}'><span class='fas fa-user-tie'></span> {% trans "Assign to customer" %}</a></li>
-            {% endif %}
-            {% if item.customer %}
-            <li><a href='#' id='stock-return-from-customer' title='{% trans "Return to stock" %}'><span class='fas fa-undo'></span> {% trans "Return to stock" %}</a></li>
-            {% endif %}
-            {% if item.belongs_to %}
-            <li>
-                <a href='#' id='stock-uninstall' title='{% trans "Uninstall stock item" %}'><span class='fas fa-unlink'></span> {% trans "Uninstall" %}</a>
-            </li>
-            {% endif %}
-        </ul>
-    </div>
-    {% endif %}
-    <!-- Edit stock item -->
-    {% if roles.stock.change and not item.is_building %}
-    <div class='btn-group'>
-        <button id='stock-edit-actions' title='{% trans "Stock actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-tools'></span> <span class='caret'></span></button>
-        <ul class='dropdown-menu' role='menu'>
-            {% if item.part.has_variants %}
-            <li><a href='#' id='stock-convert' title='{% trans "Convert to variant" %}'><span class='fas fa-screwdriver'></span> {% trans "Convert to variant" %}</a></li>
-            {% endif %}
-            {% if roles.stock.add %}
-            <li><a href='#' id='stock-duplicate' title='{% trans "Duplicate stock item" %}'><span class='fas fa-copy'></span> {% trans "Duplicate stock item" %}</a></li>
-            {% endif %}
-            <li><a href='#' id='stock-edit' title='{% trans "Edit stock item" %}'><span class='fas fa-edit icon-blue'></span> {% trans "Edit stock item" %}</a></li>
-            {% if user.is_staff or roles.stock.delete %}
-                {% if item.can_delete %}
-                <li><a href='#' id='stock-delete' title='{% trans "Delete stock item" %}'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete stock item" %}</a></li>
                 {% endif %}
-            {% endif %}
+                <li><a href='#' id='stock-move' title='{% trans "Transfer stock" %}'><span class='fas fa-exchange-alt icon-blue'></span> {% trans "Transfer stock" %}</a></li>
-        </ul>
+                {% if item.part.trackable and not item.serialized %}
-    </div>
+                <li><a href='#' id='stock-serialize' title='{% trans "Serialize stock" %}'><span class='fas fa-hashtag'></span> {% trans "Serialize stock" %}</a> </li>
+                {% endif %}
+                {% endif %}
+                {% if item.part.salable and not item.customer %}
+                <li><a href='#' id='stock-assign-to-customer' title='{% trans "Assign to customer" %}'><span class='fas fa-user-tie'></span> {% trans "Assign to customer" %}</a></li>
+                {% endif %}
+                {% if item.customer %}
+                <li><a href='#' id='stock-return-from-customer' title='{% trans "Return to stock" %}'><span class='fas fa-undo'></span> {% trans "Return to stock" %}</a></li>
+                {% endif %}
+                {% if item.belongs_to %}
+                <li>
+                    <a href='#' id='stock-uninstall' title='{% trans "Uninstall stock item" %}'><span class='fas fa-unlink'></span> {% trans "Uninstall" %}</a>
+                </li>
+                {% endif %}
+            </ul>
+        </div>
+        {% endif %}
+        <!-- Edit stock item -->
+        {% if roles.stock.change and not item.is_building %}
+        <div class='btn-group'>
+            <button id='stock-edit-actions' title='{% trans "Stock actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-tools'></span> <span class='caret'></span></button>
+            <ul class='dropdown-menu' role='menu'>
+                {% if item.part.has_variants %}
+                <li><a href='#' id='stock-convert' title='{% trans "Convert to variant" %}'><span class='fas fa-screwdriver'></span> {% trans "Convert to variant" %}</a></li>
+                {% endif %}
+                {% if roles.stock.add %}
+                <li><a href='#' id='stock-duplicate' title='{% trans "Duplicate stock item" %}'><span class='fas fa-copy'></span> {% trans "Duplicate stock item" %}</a></li>
+                {% endif %}
+                <li><a href='#' id='stock-edit' title='{% trans "Edit stock item" %}'><span class='fas fa-edit icon-blue'></span> {% trans "Edit stock item" %}</a></li>
+                {% if user.is_staff or roles.stock.delete %}
+                    {% if item.can_delete %}
+                    <li><a href='#' id='stock-delete' title='{% trans "Delete stock item" %}'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete stock item" %}</a></li>
+                    {% endif %}
+                {% endif %}
+            </ul>
+        </div>
+        {% endif %}
     {% endif %}
 </div>
 

InvenTree/stock/templates/stock/location.html

@@ -1,8 +1,20 @@
 {% extends "stock/stock_app_base.html" %}
 {% load static %}
+{% load inventree_extras %}
 {% load i18n %}
 {% block content %}
 
+{% setting_object 'STOCK_OWNERSHIP_CONTROL' as owner_control %}
+{% if owner_control.value == "True" %}
+    {% authorized_owners location.owner as owners %}
+
+    {% if location and not user in owners and not user.is_superuser %}
+    <div class='alert alert-block alert-info'>
+        {% trans "You are not in the list of owners of this location. This stock location cannot be edited." %}<br>
+    </div>
+    {% endif %}
+{% endif %}
+
 <div class='row'>
 <div class='col-sm-6'>
     {% if location %}
@@ -18,11 +30,13 @@
     <p>{% trans "All stock items" %}</p>
     {% endif %}
     <div class='btn-group action-buttons' role='group'>
-        {% if roles.stock_location.add %}
+        {% if owner_control.value == "False" or owner_control.value == "True" and user in owners or user.is_superuser or not location %}
-            <button class='btn btn-default' id='location-create' title='{% trans "Create new stock location" %}'>
+            {% if roles.stock_location.add %}
-            <span class='fas fa-plus-circle icon-green'/>
+                <button class='btn btn-default' id='location-create' title='{% trans "Create new stock location" %}'>
-            </button>
+                <span class='fas fa-plus-circle icon-green'/>
-        {% endif %}
+                </button>
+            {% endif %}
+        {% endif %} 
         <!-- Barcode actions menu -->
         {% if location %}
         <div class='btn-group'>
@@ -33,25 +47,28 @@
                 <li><a href='#' id='barcode-check-in'><span class='fas fa-arrow-right'></span> {% trans "Check-in Items" %}</a></li>
             </ul>
         </div>
-            {% if roles.stock.change %}
+             <!-- Check permissions and owner -->
-            <div class='btn-group'>
+            {% if owner_control.value == "False" or owner_control.value == "True" and user in owners or user.is_superuser %}
-                <button id='stock-actions' title='{% trans "Stock actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
+                {% if roles.stock.change %}
-                <ul class='dropdown-menu' role='menu'>
+                <div class='btn-group'>
-                    <li><a href='#' id='location-count'><span class='fas fa-clipboard-list'></span>
+                    <button id='stock-actions' title='{% trans "Stock actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
-                     {% trans "Count stock" %}</a></li>
+                    <ul class='dropdown-menu' role='menu'>
-                </ul>
+                        <li><a href='#' id='location-count'><span class='fas fa-clipboard-list'></span>
-            </div>
+                         {% trans "Count stock" %}</a></li>
-            {% endif %}
+                    </ul>
-            {% if roles.stock_location.change %}
+                </div>
-            <div class='btn-group'>
+                {% endif %}
-                <button id='location-actions' title='{% trans "Location actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle="dropdown"><span class='fas fa-sitemap'></span> <span class='caret'></span></button>
+                {% if roles.stock_location.change %}
-                <ul class='dropdown-menu' role='menu'>
+                <div class='btn-group'>
-                    <li><a href='#' id='location-edit'><span class='fas fa-edit icon-green'></span> {% trans "Edit location" %}</a></li>
+                    <button id='location-actions' title='{% trans "Location actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle="dropdown"><span class='fas fa-sitemap'></span> <span class='caret'></span></button>
-                    {% if roles.stock_location.delete %}
+                    <ul class='dropdown-menu' role='menu'>
-                    <li><a href='#' id='location-delete'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete location" %}</a></li>
+                        <li><a href='#' id='location-edit'><span class='fas fa-edit icon-green'></span> {% trans "Edit location" %}</a></li>
-                    {% endif %}
+                        {% if roles.stock.delete %}
-                </ul>
+                        <li><a href='#' id='location-delete'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete location" %}</a></li>
-            </div>
+                        {% endif %}
+                    </ul>
+                </div>
+                {% endif %}
             {% endif %}
         {% endif %}
     </div>

InvenTree/stock/test_api.py

@@ -117,7 +117,7 @@ class StockItemListTest(StockAPITestCase):
 
         response = self.get_stock()
 
-        self.assertEqual(len(response), 19)
+        self.assertEqual(len(response), 20)
 
     def test_filter_by_part(self):
         """
@@ -126,7 +126,7 @@ class StockItemListTest(StockAPITestCase):
 
         response = self.get_stock(part=25)
         
-        self.assertEqual(len(response), 7)
+        self.assertEqual(len(response), 8)
 
         response = self.get_stock(part=10004)
 
@@ -166,7 +166,7 @@ class StockItemListTest(StockAPITestCase):
         self.assertEqual(len(response), 1)
 
         response = self.get_stock(depleted=0)
-        self.assertEqual(len(response), 18)
+        self.assertEqual(len(response), 19)
 
     def test_filter_by_in_stock(self):
         """
@@ -174,7 +174,7 @@ class StockItemListTest(StockAPITestCase):
         """
 
         response = self.get_stock(in_stock=1)
-        self.assertEqual(len(response), 16)
+        self.assertEqual(len(response), 17)
 
         response = self.get_stock(in_stock=0)
         self.assertEqual(len(response), 3)
@@ -185,7 +185,7 @@ class StockItemListTest(StockAPITestCase):
         """
 
         codes = {
-            StockStatus.OK: 17,
+            StockStatus.OK: 18,
             StockStatus.DESTROYED: 1,
             StockStatus.LOST: 1,
             StockStatus.DAMAGED: 0,
@@ -218,7 +218,7 @@ class StockItemListTest(StockAPITestCase):
             self.assertIsNotNone(item['serial'])
 
         response = self.get_stock(serialized=0)
-        self.assertEqual(len(response), 7)
+        self.assertEqual(len(response), 8)
 
         for item in response:
             self.assertIsNone(item['serial'])
@@ -230,7 +230,7 @@ class StockItemListTest(StockAPITestCase):
 
         # First, we can assume that the 'stock expiry' feature is disabled
         response = self.get_stock(expired=1)
-        self.assertEqual(len(response), 19)
+        self.assertEqual(len(response), 20)
 
         # Now, ensure that the expiry date feature is enabled!
         InvenTreeSetting.set_setting('STOCK_ENABLE_EXPIRY', True, self.user)
@@ -242,7 +242,7 @@ class StockItemListTest(StockAPITestCase):
             self.assertTrue(item['expired'])
 
         response = self.get_stock(expired=0)
-        self.assertEqual(len(response), 18)
+        self.assertEqual(len(response), 19)
 
         for item in response:
             self.assertFalse(item['expired'])
@@ -259,7 +259,7 @@ class StockItemListTest(StockAPITestCase):
         self.assertEqual(len(response), 4)
 
         response = self.get_stock(expired=0)
-        self.assertEqual(len(response), 15)
+        self.assertEqual(len(response), 16)
 
 
 class StockItemTest(StockAPITestCase):

InvenTree/stock/test_views.py

@@ -10,6 +10,8 @@ from common.models import InvenTreeSetting
 import json
 from datetime import datetime, timedelta
 
+from InvenTree.status_codes import StockStatus
+
 
 class StockViewTestCase(TestCase):
 
@@ -230,3 +232,184 @@ class StockItemTest(StockViewTestCase):
         self.assertEqual(response.status_code, 200)
         data = json.loads(response.content)
         self.assertFalse(data['form_valid'])
+
+
+class StockOwnershipTest(StockViewTestCase):
+    """ Tests for stock ownership views """
+
+    def setUp(self):
+        """ Add another user for ownership tests """
+
+        super().setUp()
+
+        # Promote existing user with staff, admin and superuser statuses
+        self.user.is_staff = True
+        self.user.is_admin = True
+        self.user.is_superuser = True
+        self.user.save()
+
+        # Create a new user
+        user = get_user_model()
+        
+        self.new_user = user.objects.create_user(
+            username='john',
+            email='john@email.com',
+            password='custom123',
+        )
+
+        # Put the user into a new group with the correct permissions
+        group = Group.objects.create(name='new_group')
+        self.new_user.groups.add(group)
+
+        # Give the group *all* the permissions!
+        for rule in group.rule_sets.all():
+            rule.can_view = True
+            rule.can_change = True
+            rule.can_add = True
+            rule.can_delete = True
+
+            rule.save()
+
+    def enable_ownership(self):
+        # Enable stock location ownership
+
+        InvenTreeSetting.set_setting('STOCK_OWNERSHIP_CONTROL', True, self.user)
+        self.assertEqual(True, InvenTreeSetting.get_setting('STOCK_OWNERSHIP_CONTROL'))
+
+    def test_owner_control(self):
+        # Test stock location and item ownership
+        from .models import StockLocation, StockItem
+        from users.models import Owner
+
+        user_group = self.user.groups.all()[0]
+        user_group_owner = Owner.get_owner(user_group)
+        new_user_group = self.new_user.groups.all()[0]
+        new_user_group_owner = Owner.get_owner(new_user_group)
+
+        user_as_owner = Owner.get_owner(self.user)
+        new_user_as_owner = Owner.get_owner(self.new_user)
+
+        test_location_id = 4
+        test_item_id = 11
+
+        # Enable ownership control
+        self.enable_ownership()
+
+        # Set ownership on existing location
+        response = self.client.post(reverse('stock-location-edit', args=(test_location_id,)),
+                                    {'name': 'Office', 'owner': user_group_owner.pk},
+                                    HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertContains(response, '"form_valid": true', status_code=200)
+
+        # Set ownership on existing item (and change location)
+        response = self.client.post(reverse('stock-item-edit', args=(test_item_id,)),
+                                    {'part': 1, 'status': StockStatus.OK, 'owner': user_as_owner.pk},
+                                    HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertContains(response, '"form_valid": true', status_code=200)
+
+        # Logout
+        self.client.logout()
+
+        # Login with new user
+        self.client.login(username='john', password='custom123')
+
+        # Test location edit
+        response = self.client.post(reverse('stock-location-edit', args=(test_location_id,)),
+                                    {'name': 'Office', 'owner': new_user_group_owner.pk},
+                                    HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        
+        # Make sure the location's owner is unchanged
+        location = StockLocation.objects.get(pk=test_location_id)
+        self.assertEqual(location.owner, user_group_owner)
+
+        # Test item edit
+        response = self.client.post(reverse('stock-item-edit', args=(test_item_id,)),
+                                    {'part': 1, 'status': StockStatus.OK, 'owner': new_user_as_owner.pk},
+                                    HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+
+        # Make sure the item's owner is unchanged
+        item = StockItem.objects.get(pk=test_item_id)
+        self.assertEqual(item.owner, user_as_owner)
+
+        # Create new parent location
+        parent_location = {
+            'name': 'John Desk',
+            'description': 'John\'s desk',
+            'owner': new_user_group_owner.pk,
+        }
+
+        # Create new parent location
+        response = self.client.post(reverse('stock-location-create'),
+                                    parent_location, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertContains(response, '"form_valid": true', status_code=200)
+
+        # Retrieve created location
+        parent_location = StockLocation.objects.get(name=parent_location['name'])
+
+        # Create new child location
+        new_location = {
+            'name': 'Upper Left Drawer',
+            'description': 'John\'s desk - Upper left drawer',
+        }
+
+        # Try to create new location with neither parent or owner
+        response = self.client.post(reverse('stock-location-create'),
+                                    new_location, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertContains(response, '"form_valid": false', status_code=200)
+
+        # Try to create new location with invalid owner
+        new_location['parent'] = parent_location.id
+        new_location['owner'] = user_group_owner.pk
+        response = self.client.post(reverse('stock-location-create'),
+                                    new_location, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertContains(response, '"form_valid": false', status_code=200)
+
+        # Try to create new location with valid owner
+        new_location['owner'] = new_user_group_owner.pk
+        response = self.client.post(reverse('stock-location-create'),
+                                    new_location, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertContains(response, '"form_valid": true', status_code=200)
+        
+        # Retrieve created location
+        location_created = StockLocation.objects.get(name=new_location['name'])
+
+        # Create new item
+        new_item = {
+            'part': 25,
+            'location': location_created.pk,
+            'quantity': 123,
+            'status': StockStatus.OK,
+        }
+
+        # Try to create new item with no owner
+        response = self.client.post(reverse('stock-item-create'),
+                                    new_item, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertContains(response, '"form_valid": false', status_code=200)
+
+        # Try to create new item with invalid owner
+        new_item['owner'] = user_as_owner.pk
+        response = self.client.post(reverse('stock-item-create'),
+                                    new_item, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertContains(response, '"form_valid": false', status_code=200)
+
+        # Try to create new item with valid owner
+        new_item['owner'] = new_user_as_owner.pk
+        response = self.client.post(reverse('stock-item-create'),
+                                    new_item, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertContains(response, '"form_valid": true', status_code=200)
+
+        # Logout
+        self.client.logout()
+
+        # Login with admin
+        self.client.login(username='username', password='password')
+
+        # Switch owner of location
+        response = self.client.post(reverse('stock-location-edit', args=(location_created.pk,)),
+                                    {'name': new_location['name'], 'owner': user_group_owner.pk},
+                                    HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+        self.assertContains(response, '"form_valid": true', status_code=200)
+
+        # Check that owner was updated for item in this location
+        stock_item = StockItem.objects.all().last()
+        self.assertEqual(stock_item.owner, user_group_owner)

InvenTree/stock/views.py

@@ -11,6 +11,8 @@ from django.views.generic import DetailView, ListView, UpdateView
 from django.forms.models import model_to_dict
 from django.forms import HiddenInput
 from django.urls import reverse
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import Group
 
 from django.utils.translation import ugettext as _
 
@@ -33,6 +35,8 @@ from part.models import Part
 from .models import StockItem, StockLocation, StockItemTracking, StockItemAttachment, StockItemTestResult
 
 import common.settings
+from common.models import InvenTreeSetting
+from users.models import Owner
 
 from .admin import StockItemResource
 
@@ -125,6 +129,7 @@ class StockLocationEdit(AjaxUpdateView):
         """ Customize form data for StockLocation editing.
 
         Limit the choices for 'parent' field to those which make sense.
+        If ownership control is enabled and location has parent, disable owner field.
         """
 
         form = super(AjaxUpdateView, self).get_form()
@@ -137,8 +142,105 @@ class StockLocationEdit(AjaxUpdateView):
 
         form.fields['parent'].queryset = parent_choices
 
+        # Is ownership control enabled?
+        stock_ownership_control = InvenTreeSetting.get_setting('STOCK_OWNERSHIP_CONTROL')
+
+        if not stock_ownership_control:
+            # Hide owner field
+            form.fields['owner'].widget = HiddenInput()
+        else:
+            # Get location's owner
+            location_owner = location.owner
+
+            if location_owner:
+                if location.parent:
+                    try:
+                        # If location has parent and owner: automatically select parent's owner
+                        parent_owner = location.parent.owner
+                        form.fields['owner'].initial = parent_owner
+                    except AttributeError:
+                        pass
+                else:
+                    # If current owner exists: automatically select it
+                    form.fields['owner'].initial = location_owner
+
+                # Update queryset or disable field (only if not admin)
+                if not self.request.user.is_superuser:
+                    if type(location_owner.owner) is Group:
+                        user_as_owner = Owner.get_owner(self.request.user)
+                        queryset = location_owner.get_related_owners(include_group=True)
+
+                        if user_as_owner not in queryset:
+                            # Only owners or admin can change current owner
+                            form.fields['owner'].disabled = True
+                        else:
+                            form.fields['owner'].queryset = queryset
+
         return form
 
+    def save(self, object, form, **kwargs):
+        """ If location has children and ownership control is enabled:
+            - update owner of all children location of this location
+            - update owner for all stock items at this location
+        """
+
+        self.object = form.save()
+        
+        # Is ownership control enabled?
+        stock_ownership_control = InvenTreeSetting.get_setting('STOCK_OWNERSHIP_CONTROL')
+
+        if stock_ownership_control:
+            # Get authorized users
+            authorized_owners = self.object.owner.get_related_owners()
+
+            # Update children locations
+            children_locations = self.object.get_children()
+            for child in children_locations:
+                # Check if current owner is subset of new owner
+                if child.owner and authorized_owners:
+                    if child.owner in authorized_owners:
+                        continue
+
+                child.owner = self.object.owner
+                child.save()
+
+            # Update stock items
+            stock_items = self.object.get_stock_items()
+
+            for stock_item in stock_items:
+                # Check if current owner is subset of new owner
+                if stock_item.owner and authorized_owners:
+                    if stock_item.owner in authorized_owners:
+                        continue
+
+                stock_item.owner = self.object.owner
+                stock_item.save()
+
+        return self.object
+
+    def validate(self, item, form):
+        """ Check that owner is set if stock ownership control is enabled """
+
+        parent = form.cleaned_data.get('parent', None)
+
+        owner = form.cleaned_data.get('owner', None)
+
+        # Is ownership control enabled?
+        stock_ownership_control = InvenTreeSetting.get_setting('STOCK_OWNERSHIP_CONTROL')
+
+        if stock_ownership_control:
+            if not owner and not self.request.user.is_superuser:
+                form.add_error('owner', _('Owner is required (ownership control is enabled)'))
+            else:
+                try:
+                    if parent.owner:
+                        if parent.owner != owner:
+                            error = f'Owner requires to be equivalent to parent\'s owner ({parent.owner})'
+                            form.add_error('owner', error)
+                except AttributeError:
+                    # No parent
+                    pass
+
 
 class StockLocationQRCode(QRCodeView):
     """ View for displaying a QR code for a StockLocation object """
@@ -1082,6 +1184,18 @@ class StockAdjust(AjaxView, FormMixin):
 
             count += 1
 
+        # Is ownership control enabled?
+        stock_ownership_control = InvenTreeSetting.get_setting('STOCK_OWNERSHIP_CONTROL')
+
+        if stock_ownership_control:
+            # Fetch destination owner
+            destination_owner = destination.owner
+
+            if destination_owner:
+                # Update owner
+                item.owner = destination_owner
+                item.save()
+
         if count == 0:
             return _('No items were moved')
         
@@ -1148,8 +1262,76 @@ class StockItemEdit(AjaxUpdateView):
         if not item.part.trackable and not item.serialized:
             form.fields['serial'].widget = HiddenInput()
 
+        location = item.location
+
+        # Is ownership control enabled?
+        stock_ownership_control = InvenTreeSetting.get_setting('STOCK_OWNERSHIP_CONTROL')
+
+        if not stock_ownership_control:
+            form.fields['owner'].widget = HiddenInput()
+        else:
+            try:
+                location_owner = location.owner
+            except AttributeError:
+                location_owner = None
+
+            # Check if location has owner
+            if location_owner:
+                form.fields['owner'].initial = location_owner
+
+                # Check location's owner type and filter potential owners
+                if type(location_owner.owner) is Group:
+                    user_as_owner = Owner.get_owner(self.request.user)
+                    queryset = location_owner.get_related_owners(include_group=True)
+
+                    if user_as_owner in queryset:
+                        form.fields['owner'].initial = user_as_owner
+
+                    form.fields['owner'].queryset = queryset
+
+                elif type(location_owner.owner) is get_user_model():
+                    # If location's owner is a user: automatically set owner field and disable it
+                    form.fields['owner'].disabled = True
+                    form.fields['owner'].initial = location_owner
+
+            try:
+                item_owner = item.owner
+            except AttributeError:
+                item_owner = None
+
+            # Check if item has owner
+            if item_owner:
+                form.fields['owner'].initial = item_owner
+
+                # Check item's owner type and filter potential owners
+                if type(item_owner.owner) is Group:
+                    user_as_owner = Owner.get_owner(self.request.user)
+                    queryset = item_owner.get_related_owners(include_group=True)
+
+                    if user_as_owner in queryset:
+                        form.fields['owner'].initial = user_as_owner
+
+                    form.fields['owner'].queryset = queryset
+
+                elif type(item_owner.owner) is get_user_model():
+                    # If item's owner is a user: automatically set owner field and disable it
+                    form.fields['owner'].disabled = True
+                    form.fields['owner'].initial = item_owner
+
         return form
 
+    def validate(self, item, form):
+        """ Check that owner is set if stock ownership control is enabled """
+
+        owner = form.cleaned_data.get('owner', None)
+
+        # Is ownership control enabled?
+        stock_ownership_control = InvenTreeSetting.get_setting('STOCK_OWNERSHIP_CONTROL')
+
+        if stock_ownership_control:
+            if not owner and not self.request.user.is_superuser:
+                form.add_error('owner', _('Owner is required (ownership control is enabled)'))
+
 
 class StockItemConvert(AjaxUpdateView):
     """
@@ -1202,6 +1384,76 @@ class StockLocationCreate(AjaxCreateView):
 
         return initials
 
+    def get_form(self):
+        """ Disable owner field when:
+            - creating child location
+            - and stock ownership control is enable
+        """
+
+        form = super().get_form()
+
+        # Is ownership control enabled?
+        stock_ownership_control = InvenTreeSetting.get_setting('STOCK_OWNERSHIP_CONTROL')
+
+        if not stock_ownership_control:
+            # Hide owner field
+            form.fields['owner'].widget = HiddenInput()
+        else:
+            # If user did not selected owner: automatically match to parent's owner
+            if not form['owner'].data:
+                try:
+                    parent_id = form['parent'].value()
+                    parent = StockLocation.objects.get(pk=parent_id)
+
+                    if parent:
+                        form.fields['owner'].initial = parent.owner
+                        if not self.request.user.is_superuser:
+                            form.fields['owner'].disabled = True
+                except StockLocation.DoesNotExist:
+                    pass
+                except ValueError:
+                    pass
+
+        return form
+
+    def save(self, form):
+        """ If parent location exists then use it to set the owner """
+
+        self.object = form.save(commit=False)
+
+        parent = form.cleaned_data.get('parent', None)
+
+        if parent:
+            # Select parent's owner
+            self.object.owner = parent.owner
+
+        self.object.save()
+
+        return self.object
+
+    def validate(self, item, form):
+        """ Check that owner is set if stock ownership control is enabled """
+
+        parent = form.cleaned_data.get('parent', None)
+
+        owner = form.cleaned_data.get('owner', None)
+
+        # Is ownership control enabled?
+        stock_ownership_control = InvenTreeSetting.get_setting('STOCK_OWNERSHIP_CONTROL')
+
+        if stock_ownership_control:
+            if not owner and not self.request.user.is_superuser:
+                form.add_error('owner', _('Owner is required (ownership control is enabled)'))
+            else:
+                try:
+                    if parent.owner:
+                        if parent.owner != owner:
+                            error = f'Owner requires to be equivalent to parent\'s owner ({parent.owner})'
+                            form.add_error('owner', error)
+                except AttributeError:
+                    # No parent
+                    pass
+
 
 class StockItemSerialize(AjaxUpdateView):
     """ View for manually serializing a StockItem """
@@ -1396,7 +1648,42 @@ class StockItemCreate(AjaxCreateView):
         # Otherwise if the user has selected a SupplierPart, we know what Part they meant!
         if form['supplier_part'].value() is not None:
             pass
-            
+
+        location = None
+        try:
+            loc_id = form['location'].value()
+            location = StockLocation.objects.get(pk=loc_id)
+        except StockLocation.DoesNotExist:
+            pass
+        except ValueError:
+            pass
+
+        # Is ownership control enabled?
+        stock_ownership_control = InvenTreeSetting.get_setting('STOCK_OWNERSHIP_CONTROL')
+        if not stock_ownership_control:
+            form.fields['owner'].widget = HiddenInput()
+        else:
+            try:
+                location_owner = location.owner
+            except AttributeError:
+                location_owner = None
+
+            if location_owner:
+                # Check location's owner type and filter potential owners
+                if type(location_owner.owner) is Group:
+                    user_as_owner = Owner.get_owner(self.request.user)
+                    queryset = location_owner.get_related_owners()
+                    
+                    if user_as_owner in queryset:
+                        form.fields['owner'].initial = user_as_owner
+
+                    form.fields['owner'].queryset = queryset
+
+                elif type(location_owner.owner) is get_user_model():
+                    # If location's owner is a user: automatically set owner field and disable it
+                    form.fields['owner'].disabled = True
+                    form.fields['owner'].initial = location_owner
+                
         return form
 
     def get_initial(self):
@@ -1473,10 +1760,15 @@ class StockItemCreate(AjaxCreateView):
 
         data = form.cleaned_data
 
-        part = data['part']
+        part = data.get('part', None)
         
         quantity = data.get('quantity', None)
 
+        owner = data.get('owner', None)
+
+        if not part:
+            return
+
         if not quantity:
             return
 
@@ -1512,6 +1804,15 @@ class StockItemCreate(AjaxCreateView):
                             _('Serial numbers already exist') + ': ' + exists
                         )
 
+        # Is ownership control enabled?
+        stock_ownership_control = InvenTreeSetting.get_setting('STOCK_OWNERSHIP_CONTROL')
+
+        if stock_ownership_control:
+            # Check if owner is set
+            if not owner and not self.request.user.is_superuser:
+                form.add_error('owner', _('Owner is required (ownership control is enabled)'))
+                return
+
     def save(self, form, **kwargs):
         """
         Create a new StockItem based on the provided form data.

InvenTree/templates/InvenTree/settings/stock.html

@@ -19,6 +19,7 @@
         {% include "InvenTree/settings/setting.html" with key="STOCK_STALE_DAYS" %}
         {% include "InvenTree/settings/setting.html" with key="STOCK_ALLOW_EXPIRED_SALE" %}
         {% include "InvenTree/settings/setting.html" with key="STOCK_ALLOW_EXPIRED_BUILD" %}
+	{% include "InvenTree/settings/setting.html" with key="STOCK_OWNERSHIP_CONTROL" %}
     </tbody>
 </table>
-{% endblock %}
+{% endblock %}

InvenTree/templates/attachment_table.html

@@ -1,6 +1,5 @@
 {% load i18n %}
 
-{% if roles.stock.change %}
 <div id='attachment-buttons'>
     <div class='btn-group'>
         <button type='button' class='btn btn-success' id='new-attachment'>
@@ -8,7 +7,6 @@
         </button>
     </div>
 </div>
-{% endif %}
 
 <div class='dropzone' id='attachment-dropzone'>
 <table class='table table-striped table-condensed' data-toolbar='#attachment-buttons' id='attachment-table'>

InvenTree/templates/stock_table.html

@@ -1,4 +1,10 @@
 {% load i18n %}
+{% load inventree_extras %}
+
+{% setting_object 'STOCK_OWNERSHIP_CONTROL' as owner_control %}
+{% if owner_control.value == "True" %}
+    {% authorized_owners location.owner as owners %}
+{% endif %}
 
 <div id='button-toolbar'>
     <div class='button-toolbar container-fluid' style='float: right;'>
@@ -6,8 +12,8 @@
             <button class='btn btn-default' id='stock-export' title='{% trans "Export Stock Information" %}'>
                 <span class='fas fa-download'></span>
             </button>
-            {% if read_only %}
+
-            {% else %}
+            {% if owner_control.value == "True" and user in owners or user.is_superuser or owner_control.value == "False" %}
             {% if roles.stock.add %}
             <button class="btn btn-success" id='item-create' title='{% trans "New Stock Item" %}'>
                 <span class='fas fa-plus-circle'></span>
@@ -39,8 +45,8 @@
                     {% if roles.stock.delete %}
                     <li><a href='#' id='multi-item-delete' title='{% trans "Delete selected items" %}'><span class='fas fa-trash-alt'></span> {% trans "Delete Stock" %}</a></li>
                     {% endif %}
-                </ul>
+                    </ul>
-            </div>
+                </div>
             {% endif %}
             {% endif %}
             <div class='filter-list' id='filter-list-stock'>

InvenTree/users/admin.py

@@ -11,7 +11,7 @@ from django.contrib.auth.models import Group
 from django.contrib.auth.admin import UserAdmin
 from django.utils.safestring import mark_safe
 
-from users.models import RuleSet
+from users.models import RuleSet, Owner
 
 User = get_user_model()
 
@@ -215,8 +215,17 @@ class InvenTreeUserAdmin(UserAdmin):
     )
 
 
+class OwnerAdmin(admin.ModelAdmin):
+    """
+    Custom admin interface for the Owner model
+    """
+    pass
+
+
 admin.site.unregister(Group)
 admin.site.register(Group, RoleGroupAdmin)
 
 admin.site.unregister(User)
 admin.site.register(User, InvenTreeUserAdmin)
+
+admin.site.register(Owner, OwnerAdmin)

InvenTree/users/apps.py

@@ -16,6 +16,11 @@ class UsersConfig(AppConfig):
         except (OperationalError, ProgrammingError):
             pass
 
+        try:
+            self.update_owners()
+        except (OperationalError, ProgrammingError):
+            pass
+
     def assign_permissions(self):
 
         from django.contrib.auth.models import Group
@@ -31,3 +36,17 @@ class UsersConfig(AppConfig):
         for group in Group.objects.all():
 
             update_group_roles(group)
+
+    def update_owners(self):
+
+        from django.contrib.auth import get_user_model
+        from django.contrib.auth.models import Group
+        from users.models import Owner
+
+        # Create group owners
+        for group in Group.objects.all():
+            Owner.create(group)
+
+        # Create user owners
+        for user in get_user_model().objects.all():
+            Owner.create(user)

InvenTree/users/migrations/0005_owner_model.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.0.7 on 2021-01-11 18:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('users', '0004_auto_20210113_1909'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Owner',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('owner_id', models.PositiveIntegerField(blank=True, null=True)),
+                ('owner_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
+            ],
+        ),
+        migrations.AddConstraint(
+            model_name='owner',
+            constraint=models.UniqueConstraint(fields=('owner_type', 'owner_id'), name='unique_owner'),
+        ),
+    ]

InvenTree/users/models.py

@@ -1,12 +1,16 @@
 # -*- coding: utf-8 -*-
 
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
+from django.db.models import UniqueConstraint, Q
+from django.db.utils import IntegrityError
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 from django.dispatch import receiver
-from django.db.models.signals import post_save
+from django.db.models.signals import post_save, post_delete
 
 
 class RuleSet(models.Model):
@@ -116,6 +120,7 @@ class RuleSet(models.Model):
         'report_reportasset',
         'report_testreport',
         'part_partstar',
+        'users_owner',
 
         # Third-party tables
         'error_report_error',
@@ -350,7 +355,7 @@ def update_group_roles(group, debug=False):
             print(f"Removing permission {perm} from group {group.name}")
 
 
-@receiver(post_save, sender=Group)
+@receiver(post_save, sender=Group, dispatch_uid='create_missing_rule_sets')
 def create_missing_rule_sets(sender, instance, **kwargs):
     """
     Called *after* a Group object is saved.
@@ -392,3 +397,151 @@ def check_user_role(user, role, permission):
 
     # No matching permissions found
     return False
+
+
+class Owner(models.Model):
+    """
+    The Owner class is a proxy for a Group or User instance.
+    Owner can be associated to any InvenTree model (part, stock, build, etc.)
+
+    owner_type: Model type (Group or User)
+    owner_id: Group or User instance primary key
+    owner: Returns the Group or User instance combining the owner_type and owner_id fields
+    """
+
+    class Meta:
+        # Ensure all owners are unique
+        constraints = [
+            UniqueConstraint(fields=['owner_type', 'owner_id'],
+                             name='unique_owner')
+        ]
+
+    owner_type = models.ForeignKey(ContentType, on_delete=models.CASCADE, null=True, blank=True)
+
+    owner_id = models.PositiveIntegerField(null=True, blank=True)
+
+    owner = GenericForeignKey('owner_type', 'owner_id')
+
+    def __str__(self):
+        """ Defines the owner string representation """
+        return f'{self.owner} ({self.owner_type.name})'
+
+    @classmethod
+    def create(cls, obj):
+        """ Check if owner exist then create new owner entry """
+
+        # Check for existing owner
+        existing_owner = cls.get_owner(obj)
+
+        if not existing_owner:
+            # Create new owner
+            try:
+                return cls.objects.create(owner=obj)
+            except IntegrityError:
+                return None
+
+        return existing_owner
+
+    @classmethod
+    def get_owner(cls, user_or_group):
+        """ Get owner instance for a group or user """
+
+        user_model = get_user_model()
+        owner = None
+        content_type_id = 0
+        content_type_id_list = [ContentType.objects.get_for_model(Group).id,
+                                ContentType.objects.get_for_model(user_model).id]
+
+        # If instance type is obvious: set content type
+        if type(user_or_group) is Group:
+            content_type_id = content_type_id_list[0]
+        elif type(user_or_group) is get_user_model():
+            content_type_id = content_type_id_list[1]
+
+        if content_type_id:
+            try:
+                owner = Owner.objects.get(owner_id=user_or_group.id,
+                                          owner_type=content_type_id)
+            except Owner.DoesNotExist:
+                pass
+        else:
+            # Check whether user_or_group is a Group instance
+            try:
+                group = Group.objects.get(pk=user_or_group.id)
+            except Group.DoesNotExist:
+                group = None
+
+            if group:
+                try:
+                    owner = Owner.objects.get(owner_id=user_or_group.id,
+                                              owner_type=content_type_id_list[0])
+                except Owner.DoesNotExist:
+                    pass
+
+                return owner
+
+            # Check whether user_or_group is a User instance
+            try:
+                user = user_model.objects.get(pk=user_or_group.id)
+            except user_model.DoesNotExist:
+                user = None
+
+            if user:
+                try:
+                    owner = Owner.objects.get(owner_id=user_or_group.id,
+                                              owner_type=content_type_id_list[1])
+                except Owner.DoesNotExist:
+                    pass
+
+                return owner
+                
+        return owner
+
+    def get_related_owners(self, include_group=False):
+        """
+        Get all owners "related" to an owner.
+        This method is useful to retrieve all "user-type" owners linked to a "group-type" owner
+        """
+
+        user_model = get_user_model()
+        related_owners = None
+
+        if type(self.owner) is Group:
+            users = user_model.objects.filter(groups__name=self.owner.name)
+
+            if include_group:
+                # Include "group-type" owner in the query
+                query = Q(owner_id__in=users, owner_type=ContentType.objects.get_for_model(user_model).id) | \
+                    Q(owner_id=self.owner.id, owner_type=ContentType.objects.get_for_model(Group).id)
+            else:
+                query = Q(owner_id__in=users, owner_type=ContentType.objects.get_for_model(user_model).id)
+            
+            related_owners = Owner.objects.filter(query)
+
+        elif type(self.owner) is user_model:
+            related_owners = [self]
+
+        return related_owners
+
+
+@receiver(post_save, sender=Group, dispatch_uid='create_owner')
+@receiver(post_save, sender=get_user_model(), dispatch_uid='create_owner')
+def create_owner(sender, instance, **kwargs):
+    """
+    Callback function to create a new owner instance
+    after either a new group or user instance is saved.
+    """
+
+    Owner.create(obj=instance)
+
+
+@receiver(post_delete, sender=Group, dispatch_uid='delete_owner')
+@receiver(post_delete, sender=get_user_model(), dispatch_uid='delete_owner')
+def delete_owner(sender, instance, **kwargs):
+    """
+    Callback function to delete an owner instance
+    after either a new group or user instance is deleted.
+    """
+
+    owner = Owner.get_owner(instance)
+    owner.delete()

InvenTree/users/tests.py

@@ -3,9 +3,10 @@ from __future__ import unicode_literals
 
 from django.test import TestCase
 from django.apps import apps
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 
-from users.models import RuleSet
+from users.models import RuleSet, Owner
 
 
 class RuleSetModelTest(TestCase):
@@ -157,3 +158,48 @@ class RuleSetModelTest(TestCase):
 
         # There should now not be any permissions assigned to this group
         self.assertEqual(group.permissions.count(), 0)
+
+
+class OwnerModelTest(TestCase):
+    """
+    Some simplistic tests to ensure the Owner model is setup correctly.
+    """
+
+    def setUp(self):
+        """ Add users and groups """
+
+        # Create a new user
+        self.user = get_user_model().objects.create_user(
+            username='john',
+            email='john@email.com',
+            password='custom123',
+        )
+
+        # Put the user into a new group
+        self.group = Group.objects.create(name='new_group')
+        self.user.groups.add(self.group)
+
+    def test_owner(self):
+
+        # Check that owner was created for user
+        user_as_owner = Owner.get_owner(self.user)
+        self.assertEqual(type(user_as_owner), Owner)
+
+        # Check that owner was created for group
+        group_as_owner = Owner.get_owner(self.group)
+        self.assertEqual(type(group_as_owner), Owner)
+
+        # Get related owners (user + group)
+        related_owners = group_as_owner.get_related_owners(include_group=True)
+        self.assertTrue(user_as_owner in related_owners)
+        self.assertTrue(group_as_owner in related_owners)
+
+        # Delete user and verify owner was deleted too
+        self.user.delete()
+        user_as_owner = Owner.get_owner(self.user)
+        self.assertEqual(user_as_owner, None)
+        
+        # Delete group and verify owner was deleted too
+        self.group.delete()
+        group_as_owner = Owner.get_owner(self.group)
+        self.assertEqual(group_as_owner, None)

tasks.py

@@ -186,6 +186,10 @@ def translate(c):
     manage(c, "makemessages -e py -e html -e js")
     manage(c, "compilemessages")
 
+    path = os.path.join('InvenTree', 'script', 'translation_stats.py')
+
+    c.run(f'python {path}')
+
 @task
 def style(c):
     """