Masse salariale: bugfix total traitement et indemnites

diff --git a/project/rh/masse_salariale.py b/project/rh/masse_salariale.py
index d22bce9..fdb7762 100644 (file)
--- a/project/rh/masse_salariale.py
+++ b/project/rh/masse_salariale.py
@@ -440,7 +440,8 @@ class MasseSalariale():
                         r.type.nature_remuneration == TYPE_NATURE_CHARGES:
                     charges['autre'] += montant * facteur
 
-                if r.type.nature_remuneration == TYPE_NATURE_INDEMN:
+                if r.type.nature_remuneration == TYPE_NATURE_INDEMN or \
+                        r.type.id in (7,):
                     total_remun_annee['indemnite'] += montant * facteur
 
                 if r.type.nature_remuneration == TYPE_NATURE_PAIEMENT:
@@ -450,7 +451,7 @@ class MasseSalariale():
                     total_remun_annee['charges'] += montant * facteur
 
                 if (r.type.nature_remuneration == TYPE_NATURE_TRAITEMENT and
-                        r.type.id != TYPE_REMUN_MAD
+                        r.type.id not in (TYPE_REMUN_MAD, 7)
                         ) or r.type_id == TYPE_REMUN_BSTG:
                     total_remun_annee['traitement'] += montant * facteur