Merge branch 'inventree:master' into plugin-2037

InvenTree/common/models.py

@@ -1045,6 +1045,13 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
             'validator': [int, MinValueValidator(1)]
         },
 
+        'SEARCH_SHOW_STOCK_LEVELS': {
+            'name': _('Search Show Stock'),
+            'description': _('Display stock levels in search preview window'),
+            'default': True,
+            'validator': bool,
+        },
+
         'PART_SHOW_QUANTITY_IN_FORMS': {
             'name': _('Show Quantity in Forms'),
             'description': _('Display available part quantity in some forms'),

InvenTree/common/templates/common/delete_currency.html

@@ -1,7 +0,0 @@
-{% extends "modal_delete_form.html" %}
-
-{% block pre_form_content %}
-
-Are you sure you wish to delete this currency?
-
-{% endblock %}