Merge pull request #1095 from unicef/develop

Develop -> Master 20190311
unicef · Mar 11, 2019 · 3b6d1de · 3b6d1de
2 parents c28e99c + a42ec1f
commit 3b6d1de
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/django_api/django_api/apps/unicef/migrations/0007_auto_20190311_1900.py b/django_api/django_api/apps/unicef/migrations/0007_auto_20190311_1900.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-03-11 19:00
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('unicef', '0006_auto_20181204_0013'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='reportingperioddates',
+            unique_together=set([('external_id', 'external_business_area_code', 'report_type', 'programme_document')]),
+        ),
+    ]
diff --git a/django_api/django_api/apps/unicef/models.py b/django_api/django_api/apps/unicef/models.py
@@ -511,7 +511,7 @@ class ReportingPeriodDates(TimeStampedExternalBusinessAreaModel):
 
     class Meta:
         unique_together = (
-            (*TimeStampedExternalBusinessAreaModel.Meta.unique_together, 'programme_document')
+            (*TimeStampedExternalBusinessAreaModel.Meta.unique_together, 'report_type', 'programme_document')
         )