Fix migrations and imports

2 files changed, 11 insertions, 17 deletions

diff --git a/archaeological_files/migrations/0106_auto_20210803_1730.py b/archaeological_files/migrations/0106_auto_20210803_1730.py
index ac635e59f..532d6880c 100644
--- a/archaeological_files/migrations/0106_auto_20210803_1730.py
+++ b/archaeological_files/migrations/0106_auto_20210803_1730.py
@@ -298,9 +298,4 @@ class Migration(migrations.Migration):
             name='type_of_agreement',
             field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='archaeological_files.AgreementType', verbose_name='Type of agreement'),
         ),
-        migrations.AddField(
-            model_name='equipmentservicecost',
-            name='parent',
-            field=models.ForeignKey(blank=True, help_text='Auto-add this cost when a parent is added', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='archaeological_files.EquipmentServiceType', verbose_name='Parent'),
-        ),
     ]
diff --git a/archaeological_files/migrations/0107_auto_20220328_1222.py b/archaeological_files/migrations/0108_auto_20220707_1633.py
index 62f7551eb..fe50e8fed 100644
--- a/archaeological_files/migrations/0107_auto_20220328_1222.py
+++ b/archaeological_files/migrations/0108_auto_20220707_1633.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2022-03-28 12:22
+# Generated by Django 2.2.24 on 2022-07-07 16:33
 
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
@@ -8,10 +8,19 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('archaeological_files', '0106_auto_20210803_1730'),
+        ('archaeological_files', '0107_auto_20220705_1612'),
     ]
 
     operations = [
+        migrations.AlterModelOptions(
+            name='priceagreement',
+            options={'ordering': ('order', 'start_date', 'end_date', 'label'), 'verbose_name': 'Price agreement', 'verbose_name_plural': 'Price agreement'},
+        ),
+        migrations.AlterField(
+            model_name='equipmentservicecost',
+            name='unit',
+            field=models.CharField(blank=True, choices=[('D', 'days'), ('W', 'weeks'), ('M', 'months'), ('L', 'linear m.')], max_length=1, null=True, verbose_name='Unit'),
+        ),
         migrations.AlterField(
             model_name='file',
             name='data',
@@ -28,11 +37,6 @@ class Migration(migrations.Migration):
             field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict),
         ),
         migrations.AlterField(
-            model_name='file',
-            name='last_modified',
-            field=models.DateTimeField(),
-        ),
-        migrations.AlterField(
             model_name='historicalfile',
             name='data',
             field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict),
@@ -43,11 +47,6 @@ class Migration(migrations.Migration):
             field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict),
         ),
         migrations.AlterField(
-            model_name='historicalfile',
-            name='last_modified',
-            field=models.DateTimeField(),
-        ),
-        migrations.AlterField(
             model_name='job',
             name='child',
             field=models.ForeignKey(blank=True, help_text='Auto-add this job when a parent is added', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='parents', to='archaeological_files.Job', verbose_name='Child'),