Fix for total employe

diff --git a/project/assets/js/remun.js b/project/assets/js/remun.js
index 27ae64e..06e0354 100644 (file)
--- a/project/assets/js/remun.js
+++ b/project/assets/js/remun.js
@@ -99,6 +99,4 @@ $(document).ready(function(){
        ajouterLigne(el);
     });
     remun_totaux();
        ajouterLigne(el);
     });
     remun_totaux();

-
-

 });
 });

diff --git a/project/dae/models.py b/project/dae/models.py
index 4098e1d..cc06308 100644 (file)
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -76,6 +76,21 @@ class Poste(PosteWorkflow, rh.Poste_):
         max_digits=12, decimal_places=2, default=0
     )
 
         max_digits=12, decimal_places=2, default=0
     )
 

+    @property
+    def total_employe_min(self):
+        res = ((self.salaire_min or Decimal('0')) +
+               (self.indemn_fct_min or Decimal('0')) +
+               (self.indemn_expat_min or Decimal('0'))
+               )
+        return res
+                
+    @property
+    def total_employe_max(self):
+        return ((self.salaire_max or Decimal('0')) +
+                (self.indemn_fct_max or Decimal('0')) +
+                (self.indemn_expat_max or Decimal('0'))
+                )
+

     # Managers
     objects = PosteManager()
 
     # Managers
     objects = PosteManager()
 

diff --git a/project/dae/templates/dae/poste_resume.html b/project/dae/templates/dae/poste_resume.html
index a137956..46e2ff7 100644 (file)
--- a/project/dae/templates/dae/poste_resume.html
+++ b/project/dae/templates/dae/poste_resume.html
@@ -154,6 +154,13 @@
       <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>
       <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 class="total-row">
+      <th><strong>Total employé</strong></th>
+      <th class="montant">{{ poste.total_employe_min|floatformat:0 }}</th>
+      <th class="montant">{{ poste.total_employe_min|euros:poste.devise_max|floatformat:0 }}</th>
+      <th class="montant">{{ poste.total_employe_max|floatformat:0 }}</th>
+      <th class="montant">{{ poste.total_employe_max|euros:poste.devise_max|floatformat:0 }}</th>
+    </tr>

     <tr>
       <th colspan="5">
        Charges patronales
     <tr>
       <th colspan="5">
        Charges patronales

@@ -193,7 +200,7 @@
       <td class="montant">{{ poste.autre_max|euros:poste.devise_max|floatformat:0 }}</td>
     </tr>
     <tr class="total-row" >
       <td class="montant">{{ poste.autre_max|euros:poste.devise_max|floatformat:0 }}</td>
     </tr>
     <tr class="total-row" >

-      <th>TOTAL</th>
+      <th>Total AUF</th>

       <td class="montant">{{ poste.get_couts_minimum|floatformat:0 }}</td>
       <td class="montant">{{ poste.get_couts_minimum_euros|floatformat:0 }}</td>
       <td class="montant">{{ poste.get_couts_maximum|floatformat:0 }}</td>
       <td class="montant">{{ poste.get_couts_minimum|floatformat:0 }}</td>
       <td class="montant">{{ poste.get_couts_minimum_euros|floatformat:0 }}</td>
       <td class="montant">{{ poste.get_couts_maximum|floatformat:0 }}</td>