Merge remote-tracking branch 'origin/master' into feature/usb-aio-workflow

# Conflicts:
#	README.md
#	inventory/test_specification_migration.py

inventory/migrations/0014_allinonespecification_camera_and_more.py

@@ -0,0 +1,58 @@
+# Generated by Django 5.2.18 on 2026-10-13 08:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0013_deviceregistration'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='allinonespecification',
+            name='camera',
+            field=models.CharField(choices=[('YES', 'JA'), ('NO', 'NEIN'), ('UNKNOWN', 'UNBEKANNT')], default='UNKNOWN', max_length=10),
+        ),
+        migrations.AddField(
+            model_name='allinonespecification',
+            name='sound',
+            field=models.CharField(choices=[('YES', 'JA'), ('NO', 'NEIN'), ('UNKNOWN', 'UNBEKANNT')], default='UNKNOWN', max_length=10),
+        ),
+        migrations.AddField(
+            model_name='laptopspecification',
+            name='camera',
+            field=models.CharField(choices=[('YES', 'JA'), ('NO', 'NEIN'), ('UNKNOWN', 'UNBEKANNT')], default='UNKNOWN', max_length=10),
+        ),
+        migrations.AddField(
+            model_name='laptopspecification',
+            name='sound',
+            field=models.CharField(choices=[('YES', 'JA'), ('NO', 'NEIN'), ('UNKNOWN', 'UNBEKANNT')], default='UNKNOWN', max_length=10),
+        ),
+        migrations.AddField(
+            model_name='monitorspecification',
+            name='aspect_ratio',
+            field=models.CharField(blank=True, max_length=20),
+        ),
+        migrations.AddField(
+            model_name='monitorspecification',
+            name='displayport',
+            field=models.CharField(choices=[('YES', 'JA'), ('NO', 'NEIN'), ('UNKNOWN', 'UNBEKANNT')], default='UNKNOWN', max_length=10),
+        ),
+        migrations.AddField(
+            model_name='monitorspecification',
+            name='dvi',
+            field=models.CharField(choices=[('YES', 'JA'), ('NO', 'NEIN'), ('UNKNOWN', 'UNBEKANNT')], default='UNKNOWN', max_length=10),
+        ),
+        migrations.AddField(
+            model_name='monitorspecification',
+            name='hdmi',
+            field=models.CharField(choices=[('YES', 'JA'), ('NO', 'NEIN'), ('UNKNOWN', 'UNBEKANNT')], default='UNKNOWN', max_length=10),
+        ),
+        migrations.AddField(
+            model_name='monitorspecification',
+            name='vga',
+            field=models.CharField(choices=[('YES', 'JA'), ('NO', 'NEIN'), ('UNKNOWN', 'UNBEKANNT')], default='UNKNOWN', max_length=10),
+        ),
+    ]

inventory/migrations/0016_merge_usb_station_and_equipment.py

@@ -0,0 +1,10 @@
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("inventory", "0014_allinonespecification_camera_and_more"),
+        ("inventory", "0015_inspectionsubmission"),
+    ]
+
+    operations = []