Merged master and company migrations

InvenTree/company/migrations/0033_auto_20210410_1528.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.0.7 on 2021-04-08 17:18
+# Generated by Django 3.0.7 on 2021-04-10 05:28
 
 from django.db import migrations, models
 
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('company', '0034_supplierpart_update'),
+        ('company', '0032_auto_20210403_1837'),
     ]
 
     operations = [

InvenTree/company/migrations/0034_manufacturerpart.py

@@ -6,7 +6,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('company', '0032_auto_20210403_1837'),
+        ('company', '0033_auto_20210410_1528'),
     ]
 
     operations = [

InvenTree/company/migrations/0035_supplierpart_update.py

@@ -71,8 +71,8 @@ def supplierpart_make_manufacturer_parts(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('company', '0032_auto_20210403_1837'),
-        ('company', '0033_manufacturerpart'),
+        ('company', '0033_auto_20210410_1528'),
+        ('company', '0034_manufacturerpart'),
     ]
 
     operations = [