From: Benoit C. Sirois <benoit.clennett-sirois@auf.org>
Date: Thu, 11 Apr 2013 20:08:53 +0000 (-0400)
Subject: 6048
X-Git-Tag: 1.8~18
X-Git-Url: http://git.auf.org/?p=auf_rh_dae.git;a=commitdiff_plain;h=48ffe7d156d2e4707b875d20258c4ce21297ec81;ds=sidebyside

6048
---

diff --git a/project/dae/templates/dae/embauche-dossier-consulter.html b/project/dae/templates/dae/embauche-dossier-consulter.html
index bf4caa3..249b9b0 100644
--- a/project/dae/templates/dae/embauche-dossier-consulter.html
+++ b/project/dae/templates/dae/embauche-dossier-consulter.html
@@ -57,8 +57,6 @@
           <th>Implantation</th>
           <th>Employé</th>
           <th>Poste</th>
-          <th>Salaire</th>
-          <th>Salaire EUR</th>
       </tr>
       <tr class="gris-bkg">
           <td>{{ ancien_dossier.classement|default:"" }}</td>
@@ -66,17 +64,13 @@
           <td>{{ ancien_dossier.poste.implantation }}</td>
           <td>{{ dossier.employe }}</td>
           <td>{{ ancien_dossier.poste.nom }}</td>
-	  {% with ancien_dossier.get_salaire as salaire %} 
-	  <td>{{ salaire }}</td>
-          <td>{{ salaire.montant_euros_float|floatformat:2 }} EUR</td>
-	  {% endwith %}
       </tr>
       {% if ancien_dossier and ancien_dossier.remunerations.all.count > 0 %}
       <tr>
 	<td colspan="1">
 	  Rémunération
 	</td>
-	<td colspan="6">
+	<td colspan="4">
 	  {% rh_remun_form_for_year ancien_dossier %}
 	</td>
       </tr>
@@ -99,8 +93,6 @@
           <th>Implantation</th>
           <th>Employé</th>
           <th>Poste</th>
-          <th>Salaire</th>
-          <th>Salaire EUR</th>
     </tr>
     <tr>
           <td>{{ precedent_titulaire.classement|default:"" }}</td>
@@ -108,17 +100,13 @@
           <td>{{ precedent_titulaire.poste.implantation }}</td>
           <td>{{ precedent_titulaire.employe }}</td>
           <td>{{ precedent_titulaire.poste.nom }}</td>
-	  {% with precedent_titulaire.get_salaire as salaire %} 
-	  <td>{{ salaire }}</td>
-          <td>{{ salaire.montant_euros_float|floatformat:2 }} EUR</td>
-	  {% endwith %}
     </tr>
     {% if precedent_titulaire and precedent_titulaire.remunerations.all.count > 0 %}
     <tr>
       <td colspan="1">
 	Rémunération
       </td>
-      <td colspan="6">
+      <td colspan="4">
 	{% rh_remun_form_for_year precedent_titulaire %}
       </td>
     </tr>
diff --git a/project/dae/templates/dae/embauche_consulter.html b/project/dae/templates/dae/embauche_consulter.html
index 185a2a3..d79f4b0 100644
--- a/project/dae/templates/dae/embauche_consulter.html
+++ b/project/dae/templates/dae/embauche_consulter.html
@@ -77,8 +77,6 @@
           <th>Implantation</th>
           <th>Employé</th>
           <th>Poste</th>
-          <th>Salaire</th>
-          <th>Salaire EUR</th>
       </tr>
       {% for dc in comparaisons %}
       <tr class="gris-bkg">
@@ -87,15 +85,13 @@
           <td>{{ dc.implantation }}</td>
           <td>{{ dc.personne }}</td>
           <td>{{ dc.poste }}</td>
-	  <td>{{ dc.montant|floatformat:0 }} {{ dc.devise.code }}</td>
-          <td>{{ dc.montant_euros }} EUR</td>
       </tr>
       {% if dc.dossier_comparaison_remunerations.count > 0 %}
       <tr>
 	<td colspan="1">
 	  Rémunération
 	</td>
-	<td colspan="6">
+	<td colspan="4">
 	  {% dossier_cmp_remun_form dc %}
 	</td>
       </tr>
diff --git a/project/dae/templates/dae/poste_resume.html b/project/dae/templates/dae/poste_resume.html
index 76b7252..a137956 100644
--- a/project/dae/templates/dae/poste_resume.html
+++ b/project/dae/templates/dae/poste_resume.html
@@ -317,8 +317,6 @@
         <th>Statut</th>
         <th>Poste</th>
         <th>Implantation</th>
-        <th>Rémunération totale sans les charges patronales</th>
-        <th>EUR</th>
     </tr>
     {% for poste_connexe in comparaisons_internes.all %}
     <tr>
@@ -326,15 +324,13 @@
         <td>{{ poste_connexe.statut }}</td>
         <td>{{ poste_connexe.nom }}</td>
         <td>{{ poste_connexe.implantation }}</td>
-        <td>{{ poste_connexe.montant|floatformat:0 }} {{ poste_connexe.devise.code }}</td>
-        <td>{{ poste_connexe.montant_euros }} €</td>
     </tr>
       {% if poste_connexe.poste_comparaison_remunerations.count > 0 %}
       <tr>
-	<td colspan="1">
+	<td>
 	  Rémunération
 	</td>
-	<td colspan="6">
+	<td colspan="3">
 	  {% poste_cmp_remun_form poste_connexe %}
 	</td>
       </tr>
diff --git a/project/dae/templatetags/dae.py b/project/dae/templatetags/dae.py
index e2ea834..0e50e5e 100644
--- a/project/dae/templatetags/dae.py
+++ b/project/dae/templatetags/dae.py
@@ -141,13 +141,12 @@ def rh_remun_form_for_year(context, dossier, year=None):
         model=rh.Remuneration,
         )
 
-    def _get_qs(inst, year=year):
+    year = year or (
+        dossier.date_fin.year if
+        dossier.date_fin else
+        datetime.date.today().year)
 
-        if year == None:
-            year = (
-                inst.instance.date_fin.year if
-                inst.instance.date_fin else
-                datetime.date.today().year)
+    def _get_qs(inst, year=year):
 
         year_start = datetime.date(year, 1, 1)
         year_end = datetime.date(year, 12, 31)