Version 0.21: Zones administratives

diff --git a/CHANGES b/CHANGES
index 2518f7c..6e9120b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+0.21 (2012-07-10)
+-----------------
+
+* Ajouté les zones administratives pour les implantations.
+
 0.20 (2012-07-09)
 -----------------
 

diff --git a/auf/django/references/models.py b/auf/django/references/models.py
index cc54bf7..b043ee1 100644 (file)
--- a/auf/django/references/models.py
+++ b/auf/django/references/models.py
@@ -468,6 +468,28 @@ class Region(ActifsModel):
         return self.nom
 
 
+class ZoneAdministrative(ActifsModel):
+    """
+    Les implantations sont classées par zone administrative pour fins de
+    ressources humaines et de comptabilité. Pour les implantations
+    régionales, la zone administrative est équivalente à la région. Pour les
+    services centraux, la zone administrative est soit "Services centraux
+    Montréal" ou "Services centraux Paris".
+    """
+    code = models.CharField(max_length=4, primary_key=True)
+    nom = models.CharField(max_length=100)
+
+    class Meta:
+        db_table = 'ref_zoneadministrative'
+        ordering = ['nom']
+        verbose_name = u'zone administrative'
+        verbose_name_plural = u'zones administratives'
+        managed = MANAGED
+
+    def __unicode__(self):
+        return self.nom
+
+
 class Bureau(ActifsModel):
     """
     Bureau (donnée de référence, source: SQI).
@@ -525,6 +547,7 @@ class Implantation(ActifsModel):
         'references.Implantation', db_column='bureau_rattachement'
     )
     region = models.ForeignKey('references.Region', db_column='region')
+    zone_administrative = models.ForeignKey('references.ZoneAdministrative')
     fuseau_horaire = models.CharField(max_length=255, blank=True)
     code_meteo = models.CharField(max_length=255, blank=True)
     # responsable

diff --git a/doc/conf.py b/doc/conf.py
index 10df79e..916c991 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,9 +48,9 @@ copyright = u'2012, AUF'
 # built documents.
 #
 # The short X.Y version.
-version = '0.19'
+version = '0.21'
 # The full version, including alpha/beta/rc tags.
-release = '0.19'
+release = '0.21'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
index ed3855f..110966c 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 name = 'auf.django.references'
-version = '0.20'
+version = '0.21'
 
 setup(
     name=name,