From 6b702ef676458b99d997a11b229b23408f2aa114 Mon Sep 17 00:00:00 2001
From: eeintech <eeintech@eeinte.ch>
Date: Tue, 3 Nov 2020 07:27:51 -0500
Subject: [PATCH] Manually merged part migrations

---
 .../migrations/0052_auto_20201027_1557.py     | 19 -------------------
 InvenTree/part/migrations/0052_partrelated.py |  7 ++++++-
 .../migrations/0053_merge_20201103_1028.py    | 14 --------------
 .../0053_partcategoryparametertemplate.py     |  2 +-
 4 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100644 InvenTree/part/migrations/0052_auto_20201027_1557.py
 delete mode 100644 InvenTree/part/migrations/0053_merge_20201103_1028.py

diff --git a/InvenTree/part/migrations/0052_auto_20201027_1557.py b/InvenTree/part/migrations/0052_auto_20201027_1557.py
deleted file mode 100644
index 94dbcac06e..0000000000
--- a/InvenTree/part/migrations/0052_auto_20201027_1557.py
+++ /dev/null
@@ -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),
-        ),
-    ]
diff --git a/InvenTree/part/migrations/0052_partrelated.py b/InvenTree/part/migrations/0052_partrelated.py
index a8672ba7dc..7f9dc896a5 100644
--- a/InvenTree/part/migrations/0052_partrelated.py
+++ b/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),
+        ),
     ]
diff --git a/InvenTree/part/migrations/0053_merge_20201103_1028.py b/InvenTree/part/migrations/0053_merge_20201103_1028.py
deleted file mode 100644
index d42595675a..0000000000
--- a/InvenTree/part/migrations/0053_merge_20201103_1028.py
+++ /dev/null
@@ -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 = [
-    ]
diff --git a/InvenTree/part/migrations/0053_partcategoryparametertemplate.py b/InvenTree/part/migrations/0053_partcategoryparametertemplate.py
index e9a1e90af7..6f2809af12 100644
--- a/InvenTree/part/migrations/0053_partcategoryparametertemplate.py
+++ b/InvenTree/part/migrations/0053_partcategoryparametertemplate.py
@@ -7,7 +7,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('part', '0052_auto_20201027_1557'),
+        ('part', '0052_partrelated'),
     ]
 
     operations = [