diff options
Diffstat (limited to 'ishtar/furnitures/models.py')
| -rw-r--r-- | ishtar/furnitures/models.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index f7cc8288c..5c19f050f 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -144,11 +144,12 @@ class LightHistorizedItem(BaseHistorizedItem): class Departement(models.Model): label = models.CharField(_(u"Label"), max_length=30) - number = models.IntegerField(_(u"Number")) + number = models.CharField(_(u"Number"), unique=True, max_length=3) class Meta: verbose_name = _(u"Departement") verbose_name_plural = _(u"Departements") + ordering = ['number'] def __unicode__(self): return unicode(self.number) + u" - " + self.label @@ -669,10 +670,14 @@ if settings.COUNTRY == 'fr': class Town(models.Model): name = models.CharField(_(u"Name"), max_length=100) - surface = models.IntegerField(_(u"Surface")) - center = models.PointField(_(u"Localisation"), srid=settings.SRID) + surface = models.IntegerField(_(u"Surface"), blank=True, null=True) + 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=5) + numero_insee = models.CharField(u"Numéro INSEE", max_length=6, + unique=True) + departement = models.ForeignKey(Departement, verbose_name=u"Département", + null=True, blank=True) canton = models.ForeignKey(Canton, verbose_name=u"Canton", null=True, blank=True) objects = models.GeoManager() @@ -680,8 +685,12 @@ class Town(models.Model): class Meta: verbose_name = _(u"Town") verbose_name_plural = _(u"Towns") + if settings.COUNTRY == 'fr': + ordering = ['numero_insee'] def __unicode__(self): + if settings.COUNTRY == "fr": + return " - ".join((self.name, self.numero_insee)) return self.name class TreatmentType(GeneralType): |