UI employe

diff --git a/project/rh/models.py b/project/rh/models.py
index 290ba51..520f30d 100644 (file)
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -726,14 +726,20 @@ class Dossier_(AUFMetadata, DevisableMixin):
     # DEVISE LOCALE
 
     def get_total_local_charges_salariales(self):
+        devise = self.poste.get_devise()
         total = 0.0
         for r in self.get_charges_salariales():
-            total += r.montant
+            if r.devise != devise:
+                return None
+            total += float(r.montant)
         return total
 
     def get_total_local_charges_patronales(self):
+        devise = self.poste.get_devise()
         total = 0.0
         for r in self.get_charges_patronales():
+            if r.devise != devise:
+                return None
             total += float(r.montant)
         return total
 

diff --git a/project/rh/templates/admin/rh/employe/apercu.html b/project/rh/templates/admin/rh/employe/apercu.html
index 55bd720..0c34106 100644 (file)
--- a/project/rh/templates/admin/rh/employe/apercu.html
+++ b/project/rh/templates/admin/rh/employe/apercu.html
@@ -22,11 +22,7 @@
     {% include "rh/include/employe.html" %}
     {% for dossier in dossiers %}
         <h4>{{ dossier }}</h4>
-        {% if forloop.counter0 == 0 %}
-            {% include "rh/include/dossier.html" %}
-        {% else %}
-            <p><a target="_blank" href="{% url dossier_apercu dossier.id %}">consulter</a></p>
-        {% endif %}
+        {% include "rh/include/dossier.html" %}
         <hr />
     {% endfor %}
 {% endblock %}