[#3216] Ne pas afficher la rémunération en cours pour les dossiers inactifs

diff --git a/project/rh/models.py b/project/rh/models.py
index 9befcb5..65cbd18 100644 (file)
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -967,6 +967,12 @@ class Dossier_(AUFMetadata, DevisableMixin):
             total += r.montant_euros()
         return total
 
+    def actif(self):
+        today = date.today()
+        return (self.date_debut is None or self.date_debut <= today) \
+                and (self.date_fin is None or self.date_fin >= today) \
+                and not (self.date_fin is None and self.date_debut is None)
+
 
 class Dossier(Dossier_):
     __doc__ = Dossier_.__doc__

diff --git a/project/rh/templates/rh/include/dossier.html b/project/rh/templates/rh/include/dossier.html
index 67d3e6e..de978f5 100644 (file)
--- a/project/rh/templates/rh/include/dossier.html
+++ b/project/rh/templates/rh/include/dossier.html
@@ -19,12 +19,14 @@
     {% endif %}
 </fieldset>
 
+{% if dossier.actif %}
 <fieldset class="module aligned page-break">
     <h2>Rémunération en cours</h2>
     <table>
         {% include "dae/embauche-remun-consulter.html" %}
     </table>
 </fieldset>
+{% endif %}
 
 {% include "rh/include/pieces.html" %}