From 1cb6cf9177529742808b4e80e07166dc2a2a30e1 Mon Sep 17 00:00:00 2001
From: c82ogui <ext_guill.robin@imsa.msa.fr>
Date: Mon, 2 Dec 2024 10:13:54 +0100
Subject: [PATCH] fix(aah): msa_master fix aah conjugalise

---
 .../model/prestations/minima_sociaux/aah.py        |  4 ++--
 tests/formulas/aah/aah.yaml                        | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/openfisca_france/model/prestations/minima_sociaux/aah.py b/openfisca_france/model/prestations/minima_sociaux/aah.py
index d06c53296a..e23ee5b395 100644
--- a/openfisca_france/model/prestations/minima_sociaux/aah.py
+++ b/openfisca_france/model/prestations/minima_sociaux/aah.py
@@ -159,7 +159,7 @@ def base_ressource_eval_trim():
             base_ressource_demandeur = max_(0, assiette_revenu_activite_demandeur(
                 base_ressource_activite) + base_ressource_hors_activite)
 
-            return base_ressource_demandeur
+            return base_ressource_demandeur + assiette_conjoint(base_ressource_conjoint)
 
         def base_ressource_eval_annuelle():
             base_ressource_activite = assiette_revenu_activite_demandeur(
@@ -167,7 +167,7 @@ def base_ressource_eval_annuelle():
             base_ressource = base_ressource_activite + \
                 individu('aah_base_ressources_hors_activite_eval_annuelle', period)
 
-            return base_ressource
+            return base_ressource + assiette_conjoint(base_ressource_conjoint)
 
         return where(
             en_activite,
diff --git a/tests/formulas/aah/aah.yaml b/tests/formulas/aah/aah.yaml
index 80eefd2235..77a8bd97ee 100644
--- a/tests/formulas/aah/aah.yaml
+++ b/tests/formulas/aah/aah.yaml
@@ -134,8 +134,8 @@
       2015-10: 400
       2015-09: 400
       2015-08: 400
-      activite:
-        2018: actif
+    activite:
+      2018: actif
   output:
     aah_base_ressources_conjugalisee:
       2015-11: 80
@@ -171,9 +171,9 @@
       2018: inactif
   output:
     aah_base_ressources_conjugalisee:
-      2015-11: 154 / 12
+      2015-11: 108 / 12
     aah_base:
-      2015-11: 795
+      2015-11: 799
 
 - name: AAH demandeur sans ressource et conjoint salarié
   period: month:2015-04
@@ -186,13 +186,13 @@
         age: 40
         taux_incapacite: 0.9
         activite:
-          2018: inactif
+          2015: inactif
       parent2:
         age: 40
         salaire_imposable:
-          2013: 1128.70 * 12
+          2015: 1128.70 * 12
         activite:
-          2018: actif
+          2015: actif
   output:
     aah_base_ressources_conjugalisee:
       2015-11: