src/accounting/migrations/0007_alter_orderproduct_options_rename_user_order_member_and_more.py

@@ -0,0 +1,42 @@
+# Generated by Django 5.1b1 on 2024-08-01 10:50
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounting', '0006_alter_account_owner_alter_order_user'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='orderproduct',
+            options={'verbose_name': 'ordered product', 'verbose_name_plural': 'ordered products'},
+        ),
+        migrations.RenameField(
+            model_name='order',
+            old_name='user',
+            new_name='member',
+        ),
+        migrations.RemoveField(
+            model_name='payment',
+            name='stripe_charge_id',
+        ),
+        migrations.AddField(
+            model_name='orderproduct',
+            name='quantity',
+            field=models.PositiveSmallIntegerField(default=1),
+        ),
+        migrations.AlterField(
+            model_name='orderproduct',
+            name='order',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='accounting.order'),
+        ),
+        migrations.AlterField(
+            model_name='orderproduct',
+            name='product',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='accounting.product'),
+        ),
+    ]

src/accounting/migrations/0007_rename_user_order_member.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.0.7 on 2024-07-21 15:17
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('accounting', '0006_alter_account_owner_alter_order_user'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='order',
-            old_name='user',
-            new_name='member',
-        ),
-    ]

src/accounting/migrations/0008_alter_orderproduct_options_orderproduct_quantity.py

@@ -1,22 +0,0 @@
-# Generated by Django 5.1b1 on 2024-07-28 21:20
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('accounting', '0007_rename_user_order_member'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='orderproduct',
-            options={'verbose_name': 'ordered products'},
-        ),
-        migrations.AddField(
-            model_name='orderproduct',
-            name='quantity',
-            field=models.PositiveSmallIntegerField(default=1),
-        ),
-    ]

src/accounting/migrations/0009_alter_orderproduct_order_alter_orderproduct_product.py

@@ -1,24 +0,0 @@
-# Generated by Django 5.1b1 on 2024-07-28 21:27
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('accounting', '0008_alter_orderproduct_options_orderproduct_quantity'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='orderproduct',
-            name='order',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='accounting.order'),
-        ),
-        migrations.AlterField(
-            model_name='orderproduct',
-            name='product',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='accounting.product'),
-        ),
-    ]

src/accounting/migrations/0010_alter_orderproduct_options_and_more.py

@@ -1,21 +0,0 @@
-# Generated by Django 5.1b1 on 2024-07-31 22:02
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('accounting', '0009_alter_orderproduct_order_alter_orderproduct_product'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='orderproduct',
-            options={'verbose_name': 'ordered product', 'verbose_name_plural': 'ordered products'},
-        ),
-        migrations.RemoveField(
-            model_name='payment',
-            name='stripe_charge_id',
-        ),
-    ]

src/membership/migrations/0007_membership_activated_membership_activated_on_and_more.py

@@ -1,14 +1,16 @@
-# Generated by Django 5.1b1 on 2024-07-25 22:47
+# Generated by Django 5.1b1 on 2024-08-01 10:50
 
 import django.db.models.deletion
+from django.conf import settings
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('accounting', '0007_rename_user_order_member'),
+        ('accounting', '0007_alter_orderproduct_options_rename_user_order_member_and_more'),
         ('membership', '0006_waitinglistentry_alter_membership_options'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -52,4 +54,9 @@ class Migration(migrations.Migration):
             name='products',
             field=models.ManyToManyField(to='accounting.product'),
         ),
+        migrations.AlterField(
+            model_name='membership',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='memberships', to=settings.AUTH_USER_MODEL),
+        ),
     ]

src/membership/migrations/0008_alter_membership_user.py

@@ -1,21 +0,0 @@
-# Generated by Django 5.1b1 on 2024-07-28 21:20
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('membership', '0007_membership_activated_membership_activated_on_and_more'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='membership',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='memberships', to=settings.AUTH_USER_MODEL),
-        ),
-    ]