[#5108] Utiliser le taux de change d'une année précédente lorsqu'il manque le taux...

diff --git a/project/rh/views.py b/project/rh/views.py
index ea56d88..03bdd94 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -170,7 +170,6 @@ def rapports_employes_sans_contrat(request):
         employe = get_employe_from_user(request.user)
         lookup_params['poste__implantation__region'] = employe.implantation.region
 
-    
     dossiers = rh.Dossier.objects.sans_contrats_ou_echus(**lookup_params)
     dossiers_ids = [d.id for d in dossiers]
     employes = rh.Employe.objects.filter(id__in=dossiers_ids).distinct().count()
@@ -264,8 +263,11 @@ def rapports_masse_salariale(request):
         remuns = remun_actives.extra(
                     tables=['rh_tauxchange'],
                     where=[
-                        'rh_tauxchange.annee = %s',
-                        'rh_tauxchange.devise = rh_devise.id'
+                        'rh_tauxchange.devise = rh_devise.id',
+                        'rh_tauxchange.annee = '
+                        '(SELECT MAX(annee) FROM rh_tauxchange '
+                        'WHERE devise = rh_devise.id '
+                        'AND annee <= %s)',
                     ],
                     params=[annee],
                     select={