conflit réglé

[auf_rh_dae.git] / project / dae / models.py

diff --git a/project/dae/models.py b/project/dae/models.py
index 4573ce2..6009bd3 100644 (file)
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -45,11 +45,13 @@ class Poste(models.Model):
     # Modèle existant
     id_rh = models.ForeignKey(rh.Poste, null=True, related_name='+',
                               editable=False, verbose_name="Mise à jour du poste")
-    nom = models.CharField(max_length=255, verbose_name="Nom du poste")
+    nom = models.CharField(verbose_name="Titre du poste", max_length=255)
     implantation = models.ForeignKey(ref.Implantation)
     type_poste = models.ForeignKey(rh.TypePoste, null=True, related_name='+')
-    service = models.ForeignKey(rh.Service, related_name='+')
-    responsable = models.ForeignKey(rh.Poste, related_name='+', verbose_name="Poste du responsable")
+    service = models.ForeignKey(rh.Service, verbose_name=u"Direction/Service/Pôle support", related_name='+')
+    responsable = models.ForeignKey(rh.Poste, verbose_name="Poste du responsable", related_name='+')
+
+
     regime_travail = models.DecimalField(max_digits=12, decimal_places=2,
                                          default=100)
     regime_travail_nb_heure_semaine = models.DecimalField(max_digits=12,
@@ -57,11 +59,11 @@ class Poste(models.Model):
                                                           default=40)
 
     # Recrutement
-    statut_residence = models.CharField(max_length=10, default='MAD',
+    statut_residence = models.CharField(max_length=10, default='MAD', verbose_name="Recrutement",
                                         choices=STATUT_RESIDENCE_CHOICES)
     # TODO null?
     mise_a_disposition = models.BooleanField()
-    appel = models.CharField(max_length=10, default='interne',
+    appel = models.CharField(max_length=10, default='interne', verbose_name="Appel à candidature",
                              choices=POSTE_APPEL_CHOICES)
 
     # Rémunération
@@ -109,8 +111,8 @@ class Poste(models.Model):
     # Méta
     date_creation = models.DateTimeField(auto_now_add=True)
     date_modification = models.DateTimeField(auto_now=True)
-    date_debut = models.DateField(help_text="format: aaaa-mm-jj")
-    date_fin = models.DateField(null=True, help_text="format: aaaa-mm-jj")
+    date_debut = models.DateField(verbose_name="Date de début", help_text="format: aaaa-mm-jj")
+    date_fin = models.DateField(null=True, verbose_name="Date de fin", help_text="format: aaaa-mm-jj")
     actif = models.BooleanField(default=True)
 
     # Managers
@@ -201,9 +203,9 @@ class Dossier(models.Model):
                                   null=True,
                                   default=None)
     devise = models.ForeignKey(rh.Devise, related_name='+')
-    regime_travail = models.DecimalField(max_digits=12, decimal_places=2)
+    regime_travail = models.DecimalField(max_digits=12, verbose_name="Régime de travail", decimal_places=2)
     regime_travail_nb_heure_semaine = \
-        models.DecimalField(max_digits=12, decimal_places=2)
+        models.DecimalField(max_digits=12, verbose_name="Nbr heures par semaine", decimal_places=2)
 
     # Contrat
     type_contrat = models.ForeignKey(rh.TypeContrat, related_name='+')