Merge branch 'master' of github.com:inventree/InvenTree into ipn_edit_setting

InvenTree/InvenTree/static/css/inventree.css

@@ -586,6 +586,8 @@
 
 .breadcrump {
     margin-bottom: 5px;
+    margin-left: 5px;
+    margin-right: 10px;
 }
 
 .inventree-body {

InvenTree/build/forms.py

@@ -95,7 +95,7 @@ class BuildOutputCreateForm(HelperForm):
     confirm = forms.BooleanField(
         required=True,
         label=_('Confirm'),
-        help_text=_('Confirm creation of build outut'),
+        help_text=_('Confirm creation of build output'),
     )
 
     class Meta:

InvenTree/locale/en/LC_MESSAGES/django.po

@@ -350,7 +350,7 @@ msgid "Enter serial numbers for build outputs"
 msgstr ""
 
 #: build/forms.py:98
-msgid "Confirm creation of build outut"
+msgid "Confirm creation of build output"
 msgstr ""
 
 #: build/forms.py:118

InvenTree/locale/es/LC_MESSAGES/django.po

@@ -350,7 +350,7 @@ msgid "Enter serial numbers for build outputs"
 msgstr ""
 
 #: build/forms.py:98
-msgid "Confirm creation of build outut"
+msgid "Confirm creation of build output"
 msgstr ""
 
 #: build/forms.py:118

InvenTree/part/templates/part/part_base.html

@@ -241,6 +241,7 @@
             "{% url 'part-pricing' part.id %}",
             {
                 submit_text: 'Calculate',
+                hideErrorMessage: true,
             }
         );
     });

InvenTree/stock/api.py

@@ -665,6 +665,13 @@ class StockList(generics.ListCreateAPIView):
             active = str2bool(active)
             queryset = queryset.filter(part__active=active)
 
+        # Do we wish to filter by "assembly parts"
+        assembly = params.get('assembly', None)
+
+        if assembly is not None:
+            assembly = str2bool(assembly)
+            queryset = queryset.filter(part__assembly=assembly)
+
         # Filter by 'depleted' status
         depleted = params.get('depleted', None)
 

InvenTree/templates/js/modals.js

@@ -739,9 +739,10 @@ function handleModalForm(url, options) {
                     // Form was returned, invalid!
                     else {
 
-                        var warningDiv = $(modal).find('#form-validation-warning');
+                        if (!options.hideErrorMessage) {
-
+                            var warningDiv = $(modal).find('#form-validation-warning');
-                        warningDiv.css('display', 'block');
+                            warningDiv.css('display', 'block');
+                        }
 
                         if (response.html_form) {
                             injectModalForm(modal, response.html_form);

InvenTree/templates/js/table_filters.js

@@ -96,10 +96,15 @@ function getAvailableTableFilters(tableKey) {
                 title: '{% trans "Active parts" %}',
                 description: '{% trans "Show stock for active parts" %}',
             },
+            assembly: {
+                type: 'bool',
+                title: '{% trans "Assembly" %}',
+                description: '{% trans "Part is an assembly" %}',
+            },
             allocated: {
                 type: 'bool',
                 title: '{% trans "Is allocated" %}',
-                description: '{% trans "Item has been alloacted" %}',
+                description: '{% trans "Item has been allocated" %}',
             },
             cascade: {
                 type: 'bool',