Town unique condition: numero_insee + year (refs #3753)

2 files changed, 31 insertions, 2 deletions

diff --git a/ishtar_common/migrations/0017_auto_20171016_1320.py b/ishtar_common/migrations/0017_auto_20171016_1320.py
new file mode 100644
index 000000000..a48b36ce7
--- /dev/null
+++ b/ishtar_common/migrations/0017_auto_20171016_1320.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-16 13:20
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ishtar_common', '0016_auto_20171016_1104'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='town',
+            name='numero_insee',
+            field=models.CharField(max_length=6, verbose_name='Num\xe9ro INSEE'),
+        ),
+        migrations.AlterField(
+            model_name='town',
+            name='year',
+            field=models.IntegerField(blank=True, help_text='Filling this field is relevant to distinguish old towns to new towns.', null=True, verbose_name='Year of creation'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='town',
+            unique_together=set([('numero_insee', 'year')]),
+        ),
+    ]
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 9629ae4dd..2904e51cd 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -2569,8 +2569,7 @@ class Town(Imported, models.Model):
     center = models.PointField(_(u"Localisation"), srid=settings.SRID,
                                blank=True, null=True)
     if settings.COUNTRY == 'fr':
-        numero_insee = models.CharField(u"Numéro INSEE", max_length=6,
-                                        unique=True)
+        numero_insee = models.CharField(u"Numéro INSEE", max_length=6)
         departement = models.ForeignKey(
             Department, verbose_name=u"Département", null=True, blank=True)
         canton = models.ForeignKey(Canton, verbose_name=u"Canton", null=True,
@@ -2591,6 +2590,7 @@ class Town(Imported, models.Model):
         verbose_name_plural = _(u"Towns")
         if settings.COUNTRY == 'fr':
             ordering = ['numero_insee']
+            unique_together = (('numero_insee', 'year'),)
 
     def __unicode__(self):
         if self.cached_label: