Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev

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

diff --git a/project/dae/models.py b/project/dae/models.py
index 5d6c0cb..4ad5b7a 100644 (file)
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -83,7 +83,7 @@ class Poste(models.Model):
                                 verbose_name="Nb. heures par semaine")
 
     # Recrutement
-    statut_residence = models.CharField(max_length=10, default='MAD',
+    statut_residence = models.CharField(max_length=10, default='local', 
                                         verbose_name="Statut",
                                         choices=STATUT_RESIDENCE_CHOICES)
     # TODO null?
@@ -306,7 +306,8 @@ class Dossier(models.Model):
 
     # Recrutement
     remplacement = models.BooleanField()
-    statut_residence = models.CharField(max_length=10,
+    statut_residence = models.CharField(max_length=10, default='local', 
+                                        verbose_name="Statut",
                                         choices=STATUT_RESIDENCE_CHOICES)
 
     # Rémunération
@@ -317,14 +318,15 @@ 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,
-                                         verbose_name="Régime de travail")
+                                         verbose_name="Régime de travail",
+                                         help_text="% du temps complet")
     regime_travail_nb_heure_semaine = models.DecimalField(max_digits=12,
-            decimal_places=2, verbose_name="Nbr heures par semaine")
+            decimal_places=2, verbose_name="Nb. heures par semaine")
 
     # Contrat
     type_contrat = models.ForeignKey(rh.TypeContrat, related_name='+')
-    contrat_date_debut = models.DateField()
-    contrat_date_fin = models.DateField()
+    contrat_date_debut = models.DateField(help_text="format: aaaa-mm-jj")
+    contrat_date_fin = models.DateField(help_text="format: aaaa-mm-jj")
 
     # Comptes
     compte_compta = models.CharField(max_length=10,