Merge branch 'test' into dev

Conflicts:
	project/dae/models.py

diff --cc project/dae/models.py
index 3d4d30e,98cdb27..66b8d38
--- 1/project/dae/models.py
--- 2/project/dae/models.py
+++ b/project/dae/models.py
@@@ -396,10 -394,12 +396,12 @@@ class PostePiece(models.Model)
  class PosteComparaison(models.Model):
      poste = models.ForeignKey('Poste', related_name='comparaisons_internes')
      implantation = models.ForeignKey(ref.Implantation, null=True, blank=True, related_name="+")
 -    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, )
 +    statut = models.ForeignKey(rh.Statut, related_name='+', verbose_name=u'Statut', null=True, blank=True, )
 +    classement = models.ForeignKey(rh.Classement, related_name='+', verbose_name=u'Classement', null=True, blank=True, )
-     nom = models.CharField(verbose_name=u"Poste", max_length=255, null=True, blank=True)
-     montant = models.IntegerField(null=True)
+     nom = models.CharField(verbose_name="Poste", max_length=255, null=True, blank=True)
+     montant = models.IntegerField(
+         null=True, verbose_name="Rémunération totale sans les charges patronales"
+     )
      devise = models.ForeignKey(rh.Devise, default=5, related_name='+', null=True, blank=True)
  
      objects = PosteComparaisonManager()