Merge pull request #1688 from SchrodingersGat/supplier-part-parameters

Adds "parameters" for manufacturer parts

InvenTree/part/admin.py

@@ -111,6 +111,13 @@ class PartCategoryResource(ModelResource):
         PartCategory.objects.rebuild()
 
 
+class PartCategoryInline(admin.TabularInline):
+    """
+    Inline for PartCategory model
+    """
+    model = PartCategory
+
+
 class PartCategoryAdmin(ImportExportModelAdmin):
 
     resource_class = PartCategoryResource
@@ -119,6 +126,10 @@ class PartCategoryAdmin(ImportExportModelAdmin):
 
     search_fields = ('name', 'description')
 
+    inlines = [
+        PartCategoryInline,
+    ]
+
 
 class PartRelatedAdmin(admin.ModelAdmin):
     ''' Class to manage PartRelated objects '''

InvenTree/part/models.py

@@ -380,7 +380,6 @@ class Part(MPTTModel):
                     previous.image.delete(save=False)
 
         self.clean()
-        self.validate_unique()
 
         super().save(*args, **kwargs)
 
@@ -672,6 +671,8 @@ class Part(MPTTModel):
 
         super().clean()
 
+        self.validate_unique()
+
         if self.trackable:
             for part in self.get_used_in().all():
 

InvenTree/part/templatetags/inventree_extras.py

@@ -5,6 +5,7 @@ over and above the built-in Django tags.
 """
 
 import os
+import sys
 
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings as djangosettings
@@ -114,6 +115,14 @@ def inventree_title(*args, **kwargs):
     return version.inventreeInstanceTitle()
 
 
+@register.simple_tag()
+def python_version(*args, **kwargs):
+    """
+    Return the current python version
+    """
+    return sys.version.split(' ')[0]
+
+
 @register.simple_tag()
 def inventree_version(*args, **kwargs):
     """ Return InvenTree version string """