Merge remote-tracking branch 'inventree/master' into currency-support

# Conflicts:
#	InvenTree/InvenTree/settings.py
#	InvenTree/InvenTree/urls.py
#	InvenTree/templates/InvenTree/settings/tabs.html
#	InvenTree/users/models.py
#	requirements.txt

IMPORTANT: Had to merge some migration files due to different migrations applied on the part model tables

InvenTree/part/migrations/0052_auto_20201027_1557.py

@@ -1,19 +0,0 @@
-# Generated by Django 3.0.7 on 2020-10-27 04:57
-
-import InvenTree.fields
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('part', '0051_bomitem_optional'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='part',
-            name='link',
-            field=InvenTree.fields.InvenTreeURLField(blank=True, help_text='Link to external URL', null=True),
-        ),
-    ]

InvenTree/part/migrations/0052_partrelated.py

@@ -2,7 +2,7 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-
+import InvenTree.fields
 
 class Migration(migrations.Migration):
 
@@ -19,4 +19,9 @@ class Migration(migrations.Migration):
                 ('part_2', models.ForeignKey(help_text='Select Related Part', on_delete=django.db.models.deletion.DO_NOTHING, related_name='related_parts_2', to='part.Part')),
             ],
         ),
+        migrations.AlterField(
+            model_name='part',
+            name='link',
+            field=InvenTree.fields.InvenTreeURLField(blank=True, help_text='Link to external URL', null=True),
+        ),
     ]

InvenTree/part/migrations/0053_merge_20201103_1028.py

@@ -1,14 +0,0 @@
-# Generated by Django 3.0.7 on 2020-11-03 10:28
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('part', '0052_auto_20201027_1557'),
-        ('part', '0052_partrelated'),
-    ]
-
-    operations = [
-    ]

InvenTree/part/migrations/0053_partcategoryparametertemplate.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.0.7 on 2020-10-30 18:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0052_partrelated'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PartCategoryParameterTemplate',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('default_value', models.CharField(blank=True, help_text='Default Parameter Value', max_length=500)),
+                ('category', models.ForeignKey(help_text='Part Category', on_delete=django.db.models.deletion.CASCADE, related_name='parameter_templates', to='part.PartCategory')),
+                ('parameter_template', models.ForeignKey(help_text='Parameter Template', on_delete=django.db.models.deletion.CASCADE, related_name='part_categories', to='part.PartParameterTemplate')),
+            ],
+        ),
+        migrations.AddConstraint(
+            model_name='partcategoryparametertemplate',
+            constraint=models.UniqueConstraint(fields=('category', 'parameter_template'), name='unique_category_parameter_template_pair'),
+        ),
+    ]

InvenTree/part/migrations/0054_auto_20201109_1246.py

@@ -7,7 +7,7 @@ import part.settings
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('part', '0053_merge_20201103_1028'),
+        ('part', '0052_partrelated'),
     ]
 
     operations = [

InvenTree/part/migrations/0060_merge_20201112_1722.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.0.7 on 2020-11-12 06:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0053_partcategoryparametertemplate'),
+        ('part', '0059_auto_20201112_1112'),
+    ]
+
+    operations = [
+    ]