From: Benoit C. Sirois <benoit.clennett-sirois@auf.org>
Date: Mon, 25 Mar 2013 18:44:30 +0000 (-0400)
Subject: 5638
X-Git-Tag: 1.8~34
X-Git-Url: http://git.auf.org/?p=auf_rh_dae.git;a=commitdiff_plain;h=d48b850cbd31c0ed80beba07588a50a9c0aee231;ds=sidebyside

5638
---

diff --git a/project/dae/models.py b/project/dae/models.py
index 0223445..4098e1d 100644
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -80,15 +80,15 @@ class Poste(PosteWorkflow, rh.Poste_):
     objects = PosteManager()
 
     @property
-    def indemn_min_cad(self):
-        return ((self.indemn_expat_min or Decimal('0')) +
+    def traitement_min_cad(self):
+        return ((self.salaire_min or Decimal('0')) +
                 (self.indemn_fct_min or Decimal('0')))
 
     @property
-    def indemn_max_cad(self):
-        return ((self.indemn_expat_max or Decimal('0')) +
+    def traitement_max_cad(self):
+        return ((self.salaire_max or Decimal('0')) +
                 (self.indemn_fct_max or Decimal('0')))
-
+        
     def _get_key(self):
         """
         Les vues sont montées selon une clef spéciale
diff --git a/project/dae/templates/dae/poste_resume.html b/project/dae/templates/dae/poste_resume.html
index e1b8af8..7fa5b45 100644
--- a/project/dae/templates/dae/poste_resume.html
+++ b/project/dae/templates/dae/poste_resume.html
@@ -114,18 +114,25 @@
       </td>
     </tr>
     <tr>
+      <td class="spaced">Indem. de fonction</td>
+      <td class="montant">{{ poste.indemn_fct_min|floatformat:0 }}</td>
+      <td class="montant">{{ poste.indemn_fct_min|euros:poste.devise_min|floatformat:0 }}</td>
+      <td class="montant">{{ poste.indemn_fct_max|floatformat:0 }}</td>
+      <td class="montant">{{ poste.indemn_fct_max|euros:poste.devise_max|floatformat:0 }}</td>
+    </tr>
+    <tr>
       <td class="spaced">Sous-total</td>
       <td class="montant">
-        {{ poste.salaire_min|floatformat:0 }}
+        {{ poste.traitement_min_cad|floatformat:0 }}
       </td>
       <td class="montant">
-        {{ poste.salaire_min|euros:poste.devise_min|floatformat:0 }}
+        {{ poste.traitement_min_cad|euros:poste.devise_min|floatformat:0 }}
       </td>
       <td class="montant">
-        {{ poste.salaire_max|floatformat:0 }}
+        {{ poste.traitement_max_cad|floatformat:0 }}
       </td>
       <td class="montant">
-        {{ poste.salaire_max|euros:poste.devise_max|floatformat:0 }}
+        {{ poste.traitement_max_cad|euros:poste.devise_min|floatformat:0 }}
       </td>
     </tr>
     <tr>
@@ -141,18 +148,11 @@
       <td class="montant">{{ poste.indemn_expat_max|euros:poste.devise_max|floatformat:0 }}</td>
     </tr>
     <tr>
-      <td class="spaced">Indem. de fonction</td>
-      <td class="montant">{{ poste.indemn_fct_min|floatformat:0 }}</td>
-      <td class="montant">{{ poste.indemn_fct_min|euros:poste.devise_min|floatformat:0 }}</td>
-      <td class="montant">{{ poste.indemn_fct_max|floatformat:0 }}</td>
-      <td class="montant">{{ poste.indemn_fct_max|euros:poste.devise_max|floatformat:0 }}</td>
-    </tr>
-    <tr>
       <td class="spaced">Sous-total</td>
-      <td class="montant">{{ poste.indemn_min_cad|floatformat:0 }}</td>
-      <td class="montant">{{ poste.indemn_min_cad|euros:poste.devise_min|floatformat:0 }}</td>
-      <td class="montant">{{ poste.indemn_max_cad|floatformat:0 }}</td>
-      <td class="montant">{{ poste.indemn_max_cad|euros:poste.devise_max|floatformat:0 }}</td>
+      <td class="montant">{{ poste.indemn_expat_min|floatformat:0 }}</td>
+      <td class="montant">{{ poste.indemn_expat_min|euros:poste.devise_min|floatformat:0 }}</td>
+      <td class="montant">{{ poste.indemn_expat_max|floatformat:0 }}</td>
+      <td class="montant">{{ poste.indemn_expat_max|euros:poste.devise_max|floatformat:0 }}</td>
     </tr>
     <tr>
       <th colspan="5">