Limite expérimentation à départements associés

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 168.2.0 [2360](https://github.com/openfisca/openfisca-france/pull/2360)
+
+* Évolution du système socio-fiscal. | Correction d'un crash.
+* Périodes concernées : à partir du 01/10/2024.
+* Zones impactées : `model/prestations/minima_sociaux/ppa.`.
+* Détails :
+  - Une expérimentation sur le pré-remplissage des revenus pour calculer la prime d'activité et le RSA n'était pas limitée aux départments concernés dans https://github.com/openfisca/openfisca-france/pull/2337/files.
+
 ### 168.1.5 [2358](https://github.com/openfisca/openfisca-france/pull/2358)
 
 * Changement mineur.

openfisca_france/model/caracteristiques_socio_demographiques/logement.py

@@ -290,3 +290,12 @@ def formula(menage, period, parameters):
                 ],
             default=TypesLieuResidence.metropole
             )
+
+
+class departement_experimentation_rsa(Variable):
+    value_type = bool
+    entity = Famille
+    default_value = False
+    label = 'Résidence dans un département expérimentant le préremplissage du RSA'
+    definition_period = MONTH
+    set_input = set_input_dispatch_by_period

openfisca_france/model/prestations/minima_sociaux/ppa.py

@@ -503,7 +503,10 @@ class ppa(Variable):
     reference = 'https://www.service-public.fr/particuliers/vosdroits/F2882'
 
     def formula_2024_10(famille, period, parameters):
-        return ppa_base_formula(famille=famille, parameters=parameters, period=period, three_months_of_reference=last_3_months_offset_minus_1(period))
+        departement_experimentation_rsa = famille('departement_experimentation_rsa', period)
+        experimentation = ppa_base_formula(famille=famille, parameters=parameters, period=period, three_months_of_reference=last_3_months_offset_minus_1(period))
+        normal = ppa_base_formula(famille=famille, parameters=parameters, period=period, three_months_of_reference=period.last_3_months)
+        return where(departement_experimentation_rsa, experimentation, normal)
 
     def formula_2016_01_01(famille, period, parameters):
         return ppa_base_formula(famille=famille, parameters=parameters, period=period, three_months_of_reference=period.last_3_months)

openfisca_france/model/prestations/minima_sociaux/rsa.py

@@ -79,7 +79,10 @@ 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 = individu.famille('departement_experimentation_rsa', period)
+        experimentation = rsa_base_ressources_individu_base_formula(individu= individu, period= period, three_months_of_reference= last_3_months_offset_minus_1(period), parameters=parameters)
+        normal = rsa_base_ressources_individu_base_formula(individu= individu, period= period, three_months_of_reference= period.last_3_months, parameters=parameters)
+        return where(departement_experimentation_rsa, experimentation, normal)
 
     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,8 +149,10 @@ 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)
-        return calcul_minima_sociaux(famille= famille, period= period, three_months_of_reference=three_months_of_reference)
+        departement_experimentation_rsa = famille('departement_experimentation_rsa', period)
+        experimentation = calcul_minima_sociaux(famille= famille, period= period, three_months_of_reference= last_3_months_offset_minus_1(period))
+        normal = calcul_minima_sociaux(famille= famille, period= period, three_months_of_reference= period.last_3_months)
+        return where(departement_experimentation_rsa, experimentation, normal)
 
     def formula(famille, period):
         three_previous_months = period.last_3_months
@@ -478,8 +483,10 @@ 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 = individu.famille('departement_experimentation_rsa', period)
+        experimentation = rsa_revenu_activite_individu_base_formula(individu= individu, period= period, three_months_of_reference= last_3_months_offset_minus_1(period))
+        normal = rsa_revenu_activite_individu_base_formula(individu= individu, period= period, three_months_of_reference= period.last_3_months)
+        return where(departement_experimentation_rsa, experimentation, normal)
 
     def formula_2009_06(individu, period):
         last_3_months = period.last_3_months

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name = 'OpenFisca-France',
-    version = '168.1.5',
+    version = '168.2.0',
     author = 'OpenFisca Team',
     author_email = '[email protected]',
     classifiers = [

tests/formulas/ppa/ppa.yaml

@@ -1038,6 +1038,7 @@
     famille:
       parents: [parent1, parent2]
       ppa_eligibilite: true
+      departement_experimentation_rsa: true
       aide_logement:
         2025-01: 200
         2024-12: 200
@@ -1073,6 +1074,48 @@
   output:
     ppa: 366
 
+- name: Cas PPA period > Oct 2024 et département hors expérimentation
+  period: 2025-01
+  absolute_error_margin: 0.005
+  input:
+    famille:
+      parents: [parent1, parent2]
+      ppa_eligibilite: true
+      departement_experimentation_rsa: false
+      aide_logement:
+        2025-01: 200
+        2024-12: 200
+        2024-11: 200
+        2024-10: 200
+    individus:
+      parent1:
+        age: 40
+        salaire_net:
+          2024-11: 300
+          2024-10: 300
+          2024-09: 300
+      parent2:
+        age: 40
+        salaire_net:
+          2024-11: 300
+          2024-10: 300
+          2024-09: 300
+    foyers_fiscaux:
+      foyer_fiscal_0:
+        declarants:
+          - parent1
+      foyer_fiscal_1:
+        declarants:
+          - parent2
+    menages:
+      menage_0:
+        personne_de_reference:
+          - parent1
+      menage_1:
+        personne_de_reference:
+          - parent2
+  output:
+    ppa: 244
 
 - name: Cas PPA period < Oct 2024 et ressources sur M-1 M-3 ( à jumeler avec un test avant Octobre 2024 en M-2 M-4)
   period: 2024-09

tests/formulas/rsa.yaml

@@ -672,6 +672,7 @@
   input:
     famille:
       parents: [personne1, personne2]
+      departement_experimentation_rsa: true
       aide_logement:
         2025-01: 200
         2024-12: 200
@@ -702,6 +703,43 @@
     rsa:
       2025-01: 633.9946
 
+- name: RSA Cas period > Oct 2024 hors département d'expérimentation
+  period: 2025-01
+  absolute_error_margin: 0.05
+  input:
+    famille:
+      parents: [personne1, personne2]
+      departement_experimentation_rsa: false
+      aide_logement:
+        2025-01: 200
+        2024-12: 200
+        2024-11: 200
+        2024-10: 200
+    foyer_fiscal:
+      declarants: [personne1, personne2]
+    menage:
+      personne_de_reference: personne1
+      conjoint: personne2
+      statut_occupation_logement: locataire_vide
+    individus:
+      personne1:
+        date_naissance: 1980-01-01
+        salaire_net:
+          2025-01: 100
+          2024-11: 100
+          2024-10: 100
+          2024-09: 100
+      personne2:
+        date_naissance: 1982-02-02
+        salaire_net:
+          2025-01: 67
+          2024-11: 67
+          2024-10: 67
+          2024-09: 67
+  output:
+    rsa:
+      2025-01: 689.613
+
 
 - name: RSA Cas period < Oct 2024 et ressource sur M-1 M-3 ( à jumeler avec un test après Octobre 2024 en M-2 M-4)
   period: 2024-09