Merge branch 'dev' into test

diff --git a/buildout.cfg b/buildout.cfg
index 622c44f..b12acc5 100644 (file)
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -26,12 +26,13 @@ eggs =
     django-reversion
     simplejson
     django-ajax-selects
+    django-form-utils
+    django-tinymce
+    django-simple-captcha
     auf.django.metadata
     django-alphafilter
     django-form-utils
     django-tinymce
-    django-simple-captcha
-
 # LA PROD ne dispose que de reportlab 2.1, incompatible avec
 # les versions de pisa assez évoluées pour un bon rendu.
 #    reportlab

diff --git a/project/dae/models.py b/project/dae/models.py
index 21e76d7..a7b4cd2 100644 (file)
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -659,7 +659,7 @@ class DossierComparaison(models.Model):
     dossier = models.ForeignKey('Dossier', related_name='comparaisons')
     statut = models.ForeignKey(rh.Statut, related_name='+', verbose_name='Statut', null=True, blank=True, )
     classement = models.ForeignKey(rh.Classement, related_name='+', verbose_name='Classement', null=True, blank=True, )
-    implantation = models.ForeignKey(ref.Implantation, null=True, blank=True)
+    implantation = models.ForeignKey(ref.Implantation, related_name='+', null=True, blank=True)
     poste = models.CharField(max_length=255, null=True, blank=True)
     personne = models.CharField(max_length=255, null=True, blank=True)
     montant = models.IntegerField(null=True)