Merge pull request #1757 from IFRCGo/fix/supplies-null-to-remove

Supplies should not be null, but blank is ok.

Author: szabozoltan69

deployments/migrations/0079_auto_20230423_0628.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.18 on 2023-04-23 06:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('deployments', '0078_auto_20230421_1110'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='emergencyprojectactivity',
+            name='custom_supplies',
+            field=models.JSONField(blank=True, default=dict, verbose_name='custom supplies'),
+        ),
+        migrations.AlterField(
+            model_name='emergencyprojectactivity',
+            name='supplies',
+            field=models.JSONField(blank=True, default=dict, verbose_name='supplies'),
+        ),
+    ]

deployments/models.py

@@ -876,10 +876,10 @@ class PeopleHouseholds(models.TextChoices):
 
     # More Details
     details = models.TextField(verbose_name=_("details"), blank=True, null=True)
-    supplies = JSONField(verbose_name=_("supplies"), default=dict, blank=True, null=True)  # key: count (key: System defined id)
+    supplies = JSONField(verbose_name=_("supplies"), default=dict, blank=True)  # key: count (key: System defined id)
     # Custom action/supplies
     custom_action = models.CharField(verbose_name=_("custom_action"), max_length=255, blank=True, null=True)
-    custom_supplies = JSONField(verbose_name=_("custom supplies"), default=dict, blank=True, null=True)  # key: count (key: User defined)
+    custom_supplies = JSONField(verbose_name=_("custom supplies"), default=dict, blank=True)  # key: count (key: User defined)
     # point details
     # point_count to be used if is_simplified_report is True
     point_count = models.IntegerField(verbose_name=_("Point Count"), null=True, blank=True)