Fix migrations

4 files changed, 28 insertions, 104 deletions

diff --git a/archaeological_files/migrations/0108_auto_20220707_1633.py b/archaeological_files/migrations/0109_auto_20220711_1024.py
index fe50e8fed..05ed60586 100644
--- a/archaeological_files/migrations/0108_auto_20220707_1633.py
+++ b/archaeological_files/migrations/0109_auto_20220711_1024.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2022-07-07 16:33
+# Generated by Django 2.2.24 on 2022-07-11 10:24
 
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
@@ -8,19 +8,10 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('archaeological_files', '0107_auto_20220705_1612'),
+        ('archaeological_files', '0108_auto_20220711_0128'),
     ]
 
     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',
diff --git a/archaeological_operations/migrations/0108_auto_20220328_1222.py b/archaeological_operations/migrations/0108_auto_20220328_1222.py
deleted file mode 100644
index 507616b63..000000000
--- a/archaeological_operations/migrations/0108_auto_20220328_1222.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.2.24 on 2022-03-28 12:22
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_operations', '0107_auto_20210326_1434'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='parcel',
-            options={'ordering': ('town', 'year', 'section', 'parcel_number'), 'verbose_name': 'Parcel', 'verbose_name_plural': 'Parcels'},
-        ),
-    ]
diff --git a/archaeological_operations/migrations/0109_auto_20220328_1222.py b/archaeological_operations/migrations/0109_auto_20220711_1025.py
index 9d49dfb01..4592be2be 100644
--- a/archaeological_operations/migrations/0109_auto_20220328_1222.py
+++ b/archaeological_operations/migrations/0109_auto_20220711_1025.py
@@ -1,5 +1,6 @@
-# Generated by Django 2.2.24 on 2022-03-28 12:22
+# Generated by Django 2.2.24 on 2022-07-11 10:25
 
+import datetime
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
 import django.db.models.deletion
@@ -8,11 +9,15 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0217_auto_20220328_1222'),
-        ('archaeological_operations', '0108_auto_20220328_1222'),
+        ('ishtar_common', '0220_auto_20220707_1633'),
+        ('archaeological_operations', '0108_auto_20220711_0112'),
     ]
 
     operations = [
+        migrations.AlterModelOptions(
+            name='parcel',
+            options={'ordering': ('town', 'year', 'section', 'parcel_number'), 'verbose_name': 'Parcel', 'verbose_name_plural': 'Parcels'},
+        ),
         migrations.AddField(
             model_name='archaeologicalsite',
             name='geodata',
@@ -60,8 +65,13 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterField(
             model_name='administrativeact',
+            name='in_charge',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='adminact_operation_in_charge', to='ishtar_common.Person', verbose_name='Scientific monitor'),
+        ),
+        migrations.AlterField(
+            model_name='administrativeact',
             name='last_modified',
-            field=models.DateTimeField(),
+            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
         ),
         migrations.AlterField(
             model_name='archaeologicalsite',
@@ -76,7 +86,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='archaeologicalsite',
             name='last_modified',
-            field=models.DateTimeField(),
+            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
         ),
         migrations.AlterField(
             model_name='archaeologicalsite',
@@ -95,8 +105,13 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterField(
             model_name='historicaladministrativeact',
+            name='in_charge',
+            field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.Person', verbose_name='Scientific monitor'),
+        ),
+        migrations.AlterField(
+            model_name='historicaladministrativeact',
             name='last_modified',
-            field=models.DateTimeField(),
+            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
         ),
         migrations.AlterField(
             model_name='historicalarchaeologicalsite',
@@ -111,7 +126,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='historicalarchaeologicalsite',
             name='last_modified',
-            field=models.DateTimeField(),
+            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
         ),
         migrations.AlterField(
             model_name='historicaloperation',
@@ -131,7 +146,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='historicaloperation',
             name='last_modified',
-            field=models.DateTimeField(),
+            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
         ),
         migrations.AlterField(
             model_name='historicaloperation',
@@ -161,7 +176,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='operation',
             name='last_modified',
-            field=models.DateTimeField(),
+            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
         ),
         migrations.AlterField(
             model_name='operation',
@@ -201,7 +216,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='parcel',
             name='last_modified',
-            field=models.DateTimeField(),
+            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
         ),
         migrations.AlterField(
             model_name='parcel',
@@ -221,7 +236,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='parcelowner',
             name='last_modified',
-            field=models.DateTimeField(),
+            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
         ),
         migrations.AlterField(
             model_name='parcelowner',
diff --git a/archaeological_operations/migrations/0110_auto_20220707_1633.py b/archaeological_operations/migrations/0110_auto_20220707_1633.py
deleted file mode 100644
index 71e623e02..000000000
--- a/archaeological_operations/migrations/0110_auto_20220707_1633.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# Generated by Django 2.2.24 on 2022-07-07 16:33
-
-import datetime
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('archaeological_operations', '0109_auto_20220328_1222'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='administrativeact',
-            name='in_charge',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='adminact_operation_in_charge', to='ishtar_common.Person', verbose_name='Scientific monitor'),
-        ),
-        migrations.AlterField(
-            model_name='administrativeact',
-            name='last_modified',
-            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
-        ),
-        migrations.AlterField(
-            model_name='archaeologicalsite',
-            name='last_modified',
-            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
-        ),
-        migrations.AlterField(
-            model_name='historicaladministrativeact',
-            name='in_charge',
-            field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.Person', verbose_name='Scientific monitor'),
-        ),
-        migrations.AlterField(
-            model_name='historicaladministrativeact',
-            name='last_modified',
-            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
-        ),
-        migrations.AlterField(
-            model_name='historicalarchaeologicalsite',
-            name='last_modified',
-            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
-        ),
-        migrations.AlterField(
-            model_name='historicaloperation',
-            name='last_modified',
-            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
-        ),
-        migrations.AlterField(
-            model_name='operation',
-            name='last_modified',
-            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
-        ),
-        migrations.AlterField(
-            model_name='parcel',
-            name='last_modified',
-            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
-        ),
-        migrations.AlterField(
-            model_name='parcelowner',
-            name='last_modified',
-            field=models.DateTimeField(blank=True, default=datetime.datetime.now),
-        ),
-    ]