From 9623a92649ffc6de8fc5ee98cd976314e6619414 Mon Sep 17 00:00:00 2001
From: "Benoit C. Sirois" <benoit.clennett-sirois@auf.org>
Date: Fri, 1 Mar 2013 11:09:47 -0500
Subject: [PATCH] 5454

---
 project/dae/models.py                                     |    1 +
 project/dae/templates/dae/embauche-dossier-consulter.html |    4 ++++
 project/rh/models.py                                      |    2 +-
 project/rh/templates/rh/include/dossier.html              |    2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/project/dae/models.py b/project/dae/models.py
index 0a0bb0c..d15e9e9 100644
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -664,6 +664,7 @@ class Dossier(DossierWorkflow, rh.Dossier_):
         dossier_rh.statut_residence = self.statut_residence
         dossier_rh.classement = self.classement
         dossier_rh.regime_travail = self.regime_travail
+        dossier_rh.est_cadre = self.est_cadre
         dossier_rh.regime_travail_nb_heure_semaine = \
                 self.regime_travail_nb_heure_semaine
         dossier_rh.date_debut = self.contrat_date_debut
diff --git a/project/dae/templates/dae/embauche-dossier-consulter.html b/project/dae/templates/dae/embauche-dossier-consulter.html
index 520c44a..9ae9a1d 100644
--- a/project/dae/templates/dae/embauche-dossier-consulter.html
+++ b/project/dae/templates/dae/embauche-dossier-consulter.html
@@ -11,6 +11,10 @@
         <td>{%if dossier.remplacement %}oui{% else %}non{%endif %}</td>
     </tr>
     <tr>
+        <th>Est un cadre?</th>
+        <td>{%if dossier.est_cadre %}oui{% else %}non{%endif %}</td>
+    </tr>
+    <tr>
         <th>Durée</th>
         <td> du {{ dossier.contrat_date_debut }} au {{ dossier.contrat_date_fin }}</td>
     </tr>
diff --git a/project/rh/models.py b/project/rh/models.py
index 1f605bc..14c76f6 100644
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -812,7 +812,7 @@ class Dossier_(DateActiviteMixin, models.Model, DevisableMixin,):
 
     # Meta-data:
     est_cadre = models.BooleanField(
-        u"Est un câdre?",
+        u"Est un cadre?",
         default=False,
         )
 
diff --git a/project/rh/templates/rh/include/dossier.html b/project/rh/templates/rh/include/dossier.html
index f81895c..95811e9 100644
--- a/project/rh/templates/rh/include/dossier.html
+++ b/project/rh/templates/rh/include/dossier.html
@@ -29,7 +29,7 @@
     {% include "rh/form-row.html" with label="Régime de travail (Nb. heures par semaine)" value=dossier.regime_travail_nb_heure_semaine %}
     <div class="form-row">
       <div>
-        <label>Est un câdre :</label>
+        <label>Est un cadre :</label>
         <p>
 	  {% if dossier.est_cadre %}
 	  Oui
-- 
1.7.10.4