Merge branch 'master' into dev-greg

2 files changed, 37 insertions, 51 deletions

diff --git a/generalresearch/thl_django/migrations/0010_supplierpayout_payout_supplier_payout.py b/generalresearch/thl_django/migrations/0010_supplierpayout_payout_supplier_payout.py
deleted file mode 100644
index 5c3319c..0000000
--- a/generalresearch/thl_django/migrations/0010_supplierpayout_payout_supplier_payout.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Generated by Django 6.1 on 2026-09-01 23:15
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        (
-            "thl_django",
-            "0009_toolrun_mtrhop_portscanport_iplabel_mtr_portscan_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="SupplierPayout",
-            fields=[
-                ("id", models.BigAutoField(primary_key=True, serialize=False)),
-                ("ext_ref_id", models.CharField(max_length=64, unique=True)),
-                ("business_id", models.UUIDField(null=True)),
-                ("created", models.DateTimeField(auto_now_add=True)),
-                ("amount", models.BigIntegerField()),
-                ("status", models.CharField(max_length=20, null=True)),
-                ("payout_type", models.CharField(max_length=14)),
-                ("request_data", models.JSONField(null=True)),
-                ("order_data", models.JSONField(null=True)),
-            ],
-            options={
-                "db_table": "supplier_payout",
-                "indexes": [
-                    models.Index(
-                        fields=["created"], name="supplier_pa_created_336236_idx"
-                    ),
-                    models.Index(
-                        fields=["business_id"], name="supplier_pa_busines_2c7a4e_idx"
-                    ),
-                ],
-            },
-        ),
-        migrations.AddField(
-            model_name="payout",
-            name="supplier_payout",
-            field=models.ForeignKey(
-                null=True,
-                on_delete=django.db.models.deletion.DO_NOTHING,
-                to="thl_django.supplierpayout",
-            ),
-        ),
-    ]
diff --git a/generalresearch/thl_django/migrations/0011_supplierpayout_payout_supplier_payout.py b/generalresearch/thl_django/migrations/0011_supplierpayout_payout_supplier_payout.py
new file mode 100644
index 0000000..e665f92
--- /dev/null
+++ b/generalresearch/thl_django/migrations/0011_supplierpayout_payout_supplier_payout.py
@@ -0,0 +1,37 @@
+# Generated by Django 6.1.1 on 2026-09-07 18:18
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('thl_django', '0010_thlusermetadata_display_name'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SupplierPayout',
+            fields=[
+                ('id', models.BigAutoField(primary_key=True, serialize=False)),
+                ('ext_ref_id', models.CharField(max_length=64, unique=True)),
+                ('business_id', models.UUIDField(null=True)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('amount', models.BigIntegerField()),
+                ('status', models.CharField(max_length=20, null=True)),
+                ('payout_type', models.CharField(max_length=14)),
+                ('request_data', models.JSONField(null=True)),
+                ('order_data', models.JSONField(null=True)),
+            ],
+            options={
+                'db_table': 'supplier_payout',
+                'indexes': [models.Index(fields=['created'], name='supplier_pa_created_336236_idx'), models.Index(fields=['business_id'], name='supplier_pa_busines_2c7a4e_idx')],
+            },
+        ),
+        migrations.AddField(
+            model_name='payout',
+            name='supplier_payout',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='thl_django.supplierpayout'),
+        ),
+    ]