#2761 rémunération en cours : calculé avec régime de travail

diff --git a/project/rh/models.py b/project/rh/models.py
index 3437b87..33b6b61 100644 (file)
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -763,6 +763,9 @@ class Remuneration_(RemunerationMixin):
     def montant_mois(self):
         return round(self.montant / 12, 2)
 
+    def montant_avec_regime(self):
+        return round(self.montant * (self.dossier.regime_travail/100), 2)
+
     def taux_devise(self):
         if self.devise.code == "EUR":
             return 1

diff --git a/project/rh/templates/rh/include/remunerations.html b/project/rh/templates/rh/include/remunerations.html
index b5a74a4..4f0de77 100644 (file)
--- a/project/rh/templates/rh/include/remunerations.html
+++ b/project/rh/templates/rh/include/remunerations.html
@@ -13,7 +13,7 @@
     <tr>
         <th>{{ r.type }}</th>
         <th>{{ r.type.nature_remuneration }}</th>
-        <td style="text-align:right">{{ r.montant|floatformat:2 }} {{ r.devise.code }}</td>
+        <td style="text-align:right">{{ r.montant_avec_regime|floatformat:2 }} {{ r.devise.code }}</td>
         <td>{{ r.commentaire|default:"" }}</td>
         <td>{{ r.date_debut }}</td>
         <td>{{ r.date_fin|default:"indéterminée" }}</td>