merge qbe in rh : conflits réglés

[auf_rh_dae.git] / src / auf.django.emploi / auf / django / emploi / models.py

diff --git a/src/auf.django.emploi/auf/django/emploi/models.py b/src/auf.django.emploi/auf/django/emploi/models.py
index 306cd6e..54e72f3 100755 (executable)
--- a/src/auf.django.emploi/auf/django/emploi/models.py
+++ b/src/auf.django.emploi/auf/django/emploi/models.py
@@ -70,29 +70,29 @@ class Metadata(models.Model):
 
 class OffreEmploi(Metadata):
     est_affiche = models.BooleanField(default=False, 
 
 class OffreEmploi(Metadata):
     est_affiche = models.BooleanField(default=False, 

-                        verbose_name="À afficher sur le site institutionnel",
+                        verbose_name=u"À afficher sur le site institutionnel",

                         help_text=HELP_TEXT_EN_AFFICHAGE)
     statut = models.CharField(max_length=4, choices=STATUT_OFFRE_EMPLOI_CHOICES,
                                 default='NOUV')
                         help_text=HELP_TEXT_EN_AFFICHAGE)
     statut = models.CharField(max_length=4, choices=STATUT_OFFRE_EMPLOI_CHOICES,
                                 default='NOUV')

-    date_limite = models.DateField(verbose_name="Date limite",
+    date_limite = models.DateField(verbose_name=u"Date limite",

                         help_text=HELP_TEXT_FORMAT_DATE,)  
     nom = models.CharField(max_length=255)
                         help_text=HELP_TEXT_FORMAT_DATE,)  
     nom = models.CharField(max_length=255)

-    resume = models.TextField(verbose_name="Résumé", blank=True)
+    resume = models.TextField(verbose_name=u"Résumé", blank=True)

     description = models.TextField()
     poste = models.CharField(max_length=255)
     poste_nom = models.CharField(max_length=255)
     region = models.ForeignKey(ref.Region, db_column='region', 
     description = models.TextField()
     poste = models.CharField(max_length=255)
     poste_nom = models.CharField(max_length=255)
     region = models.ForeignKey(ref.Region, db_column='region', 

-                verbose_name="Région")
+                verbose_name=u"Région")

     bureau = models.ForeignKey(ref.Bureau, db_column='bureau', )
     duree_affectation = models.CharField(max_length=255, 
     bureau = models.ForeignKey(ref.Bureau, db_column='bureau', )
     duree_affectation = models.CharField(max_length=255, 

-                        verbose_name="Durée de l'affectation")
+                        verbose_name=u"Durée de l'affectation")

     renumeration = models.CharField(max_length=255,
     renumeration = models.CharField(max_length=255,

-                    verbose_name='Rénumération')
-    debut_affectation = models.DateField(verbose_name="Début de l'affectation",
+                    verbose_name=u'Rénumération')
+    debut_affectation = models.DateField(verbose_name=u"Début de l'affectation",

                         help_text=HELP_TEXT_FORMAT_DATE,)
     lieu_affectation = models.ForeignKey(ref.Implantation,  
                         db_column='implantation', 
                         help_text=HELP_TEXT_FORMAT_DATE,)
     lieu_affectation = models.ForeignKey(ref.Implantation,  
                         db_column='implantation', 

-                        verbose_name="Lieu d'affectation")
+                        verbose_name=u"Lieu d'affectation")

 
     class Meta:
         db_table = 'emploi_offreemploi'
 
     class Meta:
         db_table = 'emploi_offreemploi'

@@ -106,30 +106,30 @@ class Candidat(Metadata):
                 default='NOUV')
     offre_emploi = models.ForeignKey('OffreEmploi', db_column='offre_emploi',
                     related_name='+')
                 default='NOUV')
     offre_emploi = models.ForeignKey('OffreEmploi', db_column='offre_emploi',
                     related_name='+')

-    prenom = models.CharField(max_length=255, verbose_name='Prénom', )
+    prenom = models.CharField(max_length=255, verbose_name=u'Prénom', )

     nom = models.CharField(max_length=255)
     genre = models.CharField(max_length=1, choices=GENRE_CHOICES)
     nationalite = models.ForeignKey(ref.Pays, 
                     db_column='nationalite', related_name='+',
     nom = models.CharField(max_length=255)
     genre = models.CharField(max_length=1, choices=GENRE_CHOICES)
     nationalite = models.ForeignKey(ref.Pays, 
                     db_column='nationalite', related_name='+',

-                    verbose_name='Nationalité')
+                    verbose_name=u'Nationalité')

     situation_famille = models.CharField(max_length=1, 
                         choices=SITUATION_CHOICES, 
     situation_famille = models.CharField(max_length=1, 
                         choices=SITUATION_CHOICES, 

-                        verbose_name='Situation familiale', )
-    nombre_dependant = models.IntegerField(verbose_name='Nombre de dépendant',
+                        verbose_name=u'Situation familiale', )
+    nombre_dependant = models.IntegerField(verbose_name=u'Nombre de dépendant',

                         help_text=HELP_TEXT_NB_DEPENDANT, )
     niveau_diplome = models.CharField(max_length=255,
                         help_text=HELP_TEXT_NB_DEPENDANT, )
     niveau_diplome = models.CharField(max_length=255,

-                        verbose_name='Niveau du diplôme')
+                        verbose_name=u'Niveau du diplôme')

     employeur_actuel = models.CharField(max_length=255, )
     poste_actuel = models.CharField(max_length=255, )
     domaine_professionnel = models.CharField(max_length=255, )
     employeur_actuel = models.CharField(max_length=255, )
     poste_actuel = models.CharField(max_length=255, )
     domaine_professionnel = models.CharField(max_length=255, )

-    telephone = models.CharField(max_length=255, verbose_name='Téléphone', )
-    email = models.EmailField(max_length=255, verbose_name = 'Courriel', )
+    telephone = models.CharField(max_length=255, verbose_name=u'Téléphone', )
+    email = models.EmailField(max_length=255, verbose_name = u'Courriel', )

 
     # Adresse
     adresse = models.CharField(max_length=255)
     ville = models.CharField(max_length=255)
     etat_province = models.CharField(max_length=255, 
 
     # Adresse
     adresse = models.CharField(max_length=255)
     ville = models.CharField(max_length=255)
     etat_province = models.CharField(max_length=255, 

-                    verbose_name="État/Province", blank=True)
+                    verbose_name=u"État/Province", blank=True)

     code_postal = models.CharField(max_length=255, blank=True)
     pays = models.ForeignKey(ref.Pays, db_column='pays',
             related_name='+')
     code_postal = models.CharField(max_length=255, blank=True)
     pays = models.ForeignKey(ref.Pays, db_column='pays',
             related_name='+')

@@ -157,12 +157,12 @@ class CandidatPiece(models.Model):
     candidat = models.ForeignKey(Candidat, db_column='candidat',
                 related_name='candidat_piece') 
     nom = models.CharField(max_length=3, choices=TYPE_PIECE_CHOICES)
     candidat = models.ForeignKey(Candidat, db_column='candidat',
                 related_name='candidat_piece') 
     nom = models.CharField(max_length=3, choices=TYPE_PIECE_CHOICES)

-    path = models.FileField(verbose_name="Fichier", 
+    path = models.FileField(verbose_name=u"Fichier", 

                         upload_to=candidat_piece_dispatch, storage=storage_prive)
 
     class Meta:
         db_table = 'emploi_pieces'
                         upload_to=candidat_piece_dispatch, storage=storage_prive)
 
     class Meta:
         db_table = 'emploi_pieces'

-        verbose_name = "pièce jointe"
+        verbose_name = u"pièce jointe"

         verbose_name_plural = "pièces jointes"
 
     def __unicode__(self):
         verbose_name_plural = "pièces jointes"
 
     def __unicode__(self):