From db7feff56e1eeccbc275afe98cb9b694ff843bbf Mon Sep 17 00:00:00 2001
From: "Benoit C. Sirois" <benoit.clennett-sirois@auf.org>
Date: Mon, 6 May 2013 15:53:38 -0400
Subject: [PATCH 1/1] Fix

---
 project/dae/templates/dae/embauche-dossier.html   |   44 ---------------------
 project/dae/templates/dae/embauche_consulter.html |    2 +-
 project/dae/views.py                              |    8 ++++
 3 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/project/dae/templates/dae/embauche-dossier.html b/project/dae/templates/dae/embauche-dossier.html
index b405c5b..142ce5d 100644
--- a/project/dae/templates/dae/embauche-dossier.html
+++ b/project/dae/templates/dae/embauche-dossier.html
@@ -170,26 +170,6 @@
         {% endif %}
         <td></td>
     </tr>
-    <tr>
-        <td colspan="7">
-            <h3>Proposition de classement</h3>
-        </td>
-    </tr>
-    <tr>
-        <th>{{ form.classement.label_tag }}</th>
-        <th colspan="3">{{ form.salaire.label_tag }}</th>
-        <td colspan="2"></td>
-    </tr>
-    <tr>
-        <td>{{ form.classement }}<br />{{ form.classement.errors }}</td>
-        <td>{{ form.salaire.errors }} {{ form.salaire }} {{ form.devise }}
-            <span class="info">(fourchette du poste : {{ poste.salaire_min }} {{ poste.devise_min.code }}
-            - {{ poste.salaire_max }} {{ poste.devise_max.code }})</span>
-        </td>
-        <td id="salaire-propose-euros" class="montant"></td>
-        <td>€</td>
-        <td colspan="2"></td>
-    </tr>
     </tbody>
 </table>
 </fieldset>
@@ -206,27 +186,3 @@
     proposition_comparaison($('#id_devise').val());
 </script>
 
-<fieldset>
-<h2>Accès et ouverture des comptes</h2>
-<table>
-    <tbody>
-    <tr>
-        <th>
-            {{ form.compte_compta.label_tag }}
-        </th>
-        <td>
-            {{ form.compte_compta }}<br />
-            {{ form.compte_compta.errors }}
-        </td>
-        <th>
-            {{ form.compte_courriel.label_tag }}
-        </th>
-        <td>
-            {{ form.compte_courriel }}<br />
-            {{ form.compte_courriel.errors }}
-        </td>
-    </tr>
-    </tbody>
-</table>
-</fieldset>
-
diff --git a/project/dae/templates/dae/embauche_consulter.html b/project/dae/templates/dae/embauche_consulter.html
index a386f2b..e5150ae 100644
--- a/project/dae/templates/dae/embauche_consulter.html
+++ b/project/dae/templates/dae/embauche_consulter.html
@@ -135,7 +135,7 @@
 <h2 class="section">SECTION 3 - COÛT GLOBAL</h2>
 
 <fieldset>
-<h2>Proposition de classement et rémunérations</h2>
+<h2>Proposition de classement et rémunération</h2>
 <table>
     <tbody>
     <tr>
diff --git a/project/dae/views.py b/project/dae/views.py
index c0c0c7c..b7a7ff0 100644
--- a/project/dae/views.py
+++ b/project/dae/views.py
@@ -895,6 +895,14 @@ def dossier(request, poste_key, employe_key):
         employe = employe_rh
 
     dossier_form = DossierForm(initial=data, instance=dossier)
+
+    if poste_rh:
+        dossier_form.fields['employe_anterieur'].queryset = (
+            dossier_form.fields['employe_anterieur'].queryset.filter(
+                rh_dossiers__poste__pk=poste_rh.pk,
+                ).distinct()
+            )
+
     vars = dict(form=dossier_form, poste=poste, employe=employe)
     return render(request, 'dae/embauche-dossier.html', vars)
 
-- 
1.7.10.4