Merge remote-tracking branch 'inventree/master'

InvenTree/build/models.py

@@ -1018,7 +1018,7 @@ class Build(MPTTModel, ReferenceIndexingMixin):
         """Returns True if the un-tracked parts are fully allocated for this BuildOrder."""
         return self.is_fully_allocated(None)
 
-    def has_overallocated_parts(self, output):
+    def has_overallocated_parts(self, output=None):
         """Check if parts have been 'over-allocated' against the specified output.
 
         Note: If output=None, test un-tracked parts

InvenTree/build/templates/build/build_base.html

@@ -236,6 +236,7 @@ src="{% static 'img/blank_image.png' %}"
         {% else %}
 
         completeBuildOrder({{ build.pk }}, {
+            overallocated: {% if build.has_overallocated_parts %}true{% else %}false{% endif %},
             allocated: {% if build.are_untracked_parts_allocated %}true{% else %}false{% endif %},
             completed: {% if build.remaining == 0 %}true{% else %}false{% endif %},
         });

InvenTree/templates/InvenTree/settings/plugin.html

@@ -13,7 +13,7 @@
 {% block content %}
 
 <div class='alert alert-block alert-danger'>
-    {% trans "Changing the settings below require you to immediatly restart the server. Do not change this while under active usage." %}
+    {% trans "Changing the settings below require you to immediately restart the server. Do not change this while under active usage." %}
 </div>
 
 <div class='table-responsive'>

InvenTree/templates/js/translated/attachment.js

@@ -196,6 +196,7 @@ function loadAttachmentTable(url, options) {
         search: true,
         queryParams: options.filters || {},
         uniqueId: 'pk',
+        sidePagination: 'server',
         onPostBody: function() {
 
             // Add callback for 'edit' button

InvenTree/templates/js/translated/build.js

@@ -211,6 +211,10 @@ function completeBuildOrder(build_id, options={}) {
         delete fields.accept_incomplete;
     }
 
+    if (!options.overallocated) {
+        delete fields.accept_overallocated;
+    }
+
     constructForm(url, {
         fields: fields,
         reload: true,

InvenTree/templates/js/translated/tables.js

@@ -375,10 +375,6 @@ $.fn.inventreeTable = function(options) {
         options.totalField = 'count';
         options.dataField = 'results';
 
-        if (options.sidePagination == null) {
-            options.sidePagination = 'server';
-        }
-
     } else {
         options.pagination = false;
     }