From 20ae6e5beb59fdc321f1844a4e3f62f5f531f1f1 Mon Sep 17 00:00:00 2001 From: Duchesne Sylvain Date: Tue, 1 Oct 2024 18:13:31 +0200 Subject: [PATCH] =?UTF-8?q?Isole=20l'exp=C3=A9rimentation=20pour=20le=20rs?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/prestations/minima_sociaux/rsa.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/openfisca_france/model/prestations/minima_sociaux/rsa.py b/openfisca_france/model/prestations/minima_sociaux/rsa.py index 9f00da460a..21fe14218f 100644 --- a/openfisca_france/model/prestations/minima_sociaux/rsa.py +++ b/openfisca_france/model/prestations/minima_sociaux/rsa.py @@ -79,7 +79,9 @@ class rsa_base_ressources_individu(Variable): reference = 'https://www.legifrance.gouv.fr/affichCodeArticle.do?cidTexte=LEGITEXT000006073189&idArticle=LEGIARTI000036393176&dateTexte=&categorieLien=id' def formula_2024_10(individu, period, parameters): - return rsa_base_ressources_individu_base_formula(individu= individu, period= period, three_months_of_reference= last_3_months_offset_minus_1(period), parameters=parameters) + departement_experimentation_rsa = famille('departement_experimentation_rsa', period) + three_months_of_reference = where(departement_experimentation_rsa, last_3_months_offset_minus_1, period.last_3_months) + return rsa_base_ressources_individu_base_formula(individu= individu, period= period, three_months_of_reference= three_months_of_reference, parameters=parameters) def formula_2009_06_01(individu, period, parameters): return rsa_base_ressources_individu_base_formula(individu= individu, period= period, three_months_of_reference= period.last_3_months, parameters=parameters) @@ -146,7 +148,8 @@ class rsa_base_ressources_minima_sociaux(Variable): set_input = set_input_divide_by_period def formula_2024_10(famille, period): - three_months_of_reference = last_3_months_offset_minus_1(period) + departement_experimentation_rsa = famille('departement_experimentation_rsa', period) + three_months_of_reference = where(departement_experimentation_rsa, last_3_months_offset_minus_1, period.last_3_months) return calcul_minima_sociaux(famille= famille, period= period, three_months_of_reference=three_months_of_reference) def formula(famille, period): @@ -478,8 +481,9 @@ class rsa_revenu_activite_individu(Variable): set_input = set_input_divide_by_period def formula_2024_10(individu, period): - period_m2_m4 = last_3_months_offset_minus_1(period) - return rsa_revenu_activite_individu_base_formula(individu= individu, period=period, three_months_of_reference=period_m2_m4) + departement_experimentation_rsa = famille('departement_experimentation_rsa', period) + three_months_of_reference = where(departement_experimentation_rsa, last_3_months_offset_minus_1, period.last_3_months) + return rsa_revenu_activite_individu_base_formula(individu= individu, period= period, three_months_of_reference= three_months_of_reference) def formula_2009_06(individu, period): last_3_months = period.last_3_months