Migration squash

2 files changed, 21 insertions, 36 deletions

diff --git a/archaeological_finds/migrations/0106_auto_20201104_1000.py b/archaeological_finds/migrations/0106_auto_20201201_1534.py
index 60fee9e8b..a504a1a82 100644
--- a/archaeological_finds/migrations/0106_auto_20201104_1000.py
+++ b/archaeological_finds/migrations/0106_auto_20201201_1534.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-11-04 10:00
+# Generated by Django 1.11.27 on 2020-12-01 15:34
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -20,6 +20,11 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='basefind',
+            name='custom_index',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
+        ),
+        migrations.AddField(
+            model_name='basefind',
             name='qrcode',
             field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path),
         ),
@@ -29,12 +34,22 @@ class Migration(migrations.Migration):
             field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
         ),
         migrations.AddField(
+            model_name='find',
+            name='custom_index',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
+        ),
+        migrations.AddField(
             model_name='historicalbasefind',
             name='complete_identifier',
             field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
         ),
         migrations.AddField(
             model_name='historicalbasefind',
+            name='custom_index',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
+        ),
+        migrations.AddField(
+            model_name='historicalbasefind',
             name='qrcode',
             field=models.TextField(blank=True, max_length=255, null=True),
         ),
@@ -43,4 +58,9 @@ class Migration(migrations.Migration):
             name='complete_identifier',
             field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
         ),
+        migrations.AddField(
+            model_name='historicalfind',
+            name='custom_index',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
+        ),
     ]
diff --git a/archaeological_finds/migrations/0107_auto_20201117_0759.py b/archaeological_finds/migrations/0107_auto_20201117_0759.py
deleted file mode 100644
index c451c601a..000000000
--- a/archaeological_finds/migrations/0107_auto_20201117_0759.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-11-17 07:59
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_finds', '0106_auto_20201104_1000'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='basefind',
-            name='custom_index',
-            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
-        ),
-        migrations.AddField(
-            model_name='find',
-            name='custom_index',
-            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
-        ),
-        migrations.AddField(
-            model_name='historicalbasefind',
-            name='custom_index',
-            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
-        ),
-        migrations.AddField(
-            model_name='historicalfind',
-            name='custom_index',
-            field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
-        ),
-    ]