Merge branch 'master' into categories_parameters

InvenTree/part/forms.py

@@ -155,11 +155,6 @@ class CreatePartRelatedForm(HelperForm):
             'part_2': _('Related Part'),
         }
 
-    def save(self):
-        """ Disable model saving """
-
-        return super(CreatePartRelatedForm, self).save(commit=False)
-
 
 class EditPartAttachmentForm(HelperForm):
     """ Form for editing a PartAttachment object """
@@ -180,7 +175,9 @@ class SetPartCategoryForm(forms.Form):
 
 
 class EditPartForm(HelperForm):
-    """ Form for editing a Part object """
+    """
+    Form for editing a Part object.
+    """
 
     field_prefix = {
         'keywords': 'fa-key',
@@ -218,9 +215,6 @@ class EditPartForm(HelperForm):
     class Meta:
         model = Part
         fields = [
-            'bom_copy',
-            'parameters_copy',
-            'confirm_creation',
             'category',
             'selected_category_templates',
             'parent_category_templates',
@@ -228,6 +222,9 @@ class EditPartForm(HelperForm):
             'IPN',
             'description',
             'revision',
+            'bom_copy',
+            'parameters_copy',
+            'confirm_creation',
             'keywords',
             'variant_of',
             'link',
@@ -235,6 +232,9 @@ class EditPartForm(HelperForm):
             'default_supplier',
             'units',
             'minimum_stock',
+            'trackable',
+            'purchaseable',
+            'salable',
         ]