Add new fields for towns - update default department and states for France

1 files changed, 14 insertions, 1 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index fe907f014..358c66572 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -879,9 +879,22 @@ class DocumentTemplate(models.Model):
         missing = ooo_replace(self.template, output_name, values)
         return output_name
 
+class State(models.Model):
+    label = models.CharField(_(u"Label"), max_length=30)
+    number = models.CharField(_(u"Number"), unique=True, max_length=3)
+
+    class Meta:
+        verbose_name = _(u"State")
+        ordering = ['number']
+
+    def __unicode__(self):
+        return self.label
+
 class Department(models.Model):
     label = models.CharField(_(u"Label"), max_length=30)
     number = models.CharField(_(u"Number"), unique=True, max_length=3)
+    state = models.ForeignKey('State', verbose_name=_(u"State"), blank=True,
+                              null=True)
 
     class Meta:
         verbose_name = _(u"Department")
@@ -889,7 +902,7 @@ class Department(models.Model):
         ordering = ['number']
 
     def __unicode__(self):
-        return u"%s (%s)" % (self.label, self.number)
+        return self.label
 
 class Address(BaseHistorizedItem):
     address = models.TextField(_(u"Address"), null=True, blank=True)