deplace les parametres de r0 (secteur locatif)

openfisca · Mar 5, 2025 · e8065df · e8065df
1 parent 60b7cb7
commit e8065df
Show file tree

Hide file tree

Showing 38 changed files with 28 additions and 37 deletions.
diff --git a/openfisca_france/model/prestations/aides_logement.py b/openfisca_france/model/prestations/aides_logement.py
@@ -1165,7 +1165,7 @@ class aide_logement_R0(Variable):
     set_input = set_input_divide_by_period
 
     def formula(famille, period, parameters):
-        al = parameters(period).prestations_sociales.aides_logement.allocations_logement
+        al_r0 = parameters(period).prestations_sociales.aides_logement.allocations_logement.secteur_locatif.pp_participation_personnelle.r0_abattement_ressources_menage
         pfam_n_2 = parameters(period.start.offset(-2, 'year')).prestations_sociales.prestations_familiales.bmaf
         minim_n_2 = parameters(period.start.offset(-2, 'year')).prestations_sociales.solidarite_insertion.minima_sociaux
         couple = famille('al_couple', period)
@@ -1179,17 +1179,17 @@ def formula(famille, period, parameters):
             montant_de_base = minim_n_2.rmi.rmi_m.montant_de_base_du_rmi
 
         R1 = montant_de_base * (
-            al.al_param_r0.r1_en_rsa_socle_1.personne_isolee * not_(couple) * (al_nb_pac == 0)
-            + al.al_param_r0.r1_en_rsa_socle_1.couple_sans_enf * couple * (al_nb_pac == 0)
-            + al.al_param_r0.r1_en_rsa_socle_1.personne_isolee_ou_couple_avec_1_enf * (al_nb_pac == 1)
-            + al.al_param_r0.r1_en_rsa_socle_1.personne_isolee_ou_couple_avec_2_enf * (al_nb_pac >= 2)
-            + al.al_param_r0.r1_en_rsa_socle_1.majoration_enfant_a_charge_supp * (al_nb_pac > 2) * (al_nb_pac - 2)
+            al_r0.r1_en_rsa_socle_1.personne_isolee * not_(couple) * (al_nb_pac == 0)
+            + al_r0.r1_en_rsa_socle_1.couple_sans_enf * couple * (al_nb_pac == 0)
+            + al_r0.r1_en_rsa_socle_1.personne_isolee_ou_couple_avec_1_enf * (al_nb_pac == 1)
+            + al_r0.r1_en_rsa_socle_1.personne_isolee_ou_couple_avec_2_enf * (al_nb_pac >= 2)
+            + al_r0.r1_en_rsa_socle_1.majoration_enfant_a_charge_supp * (al_nb_pac > 2) * (al_nb_pac - 2)
             )
 
         R2 = pfam_n_2.bmaf * (
-            al.al_param_r0.r2_en_bmaf_1.taux3_dom * residence_dom * (al_nb_pac == 1)
-            + al.al_param_r0.r2_en_bmaf_1.personnes_isolees_ou_couples_avec_2_enf * (al_nb_pac >= 2)
-            + al.al_param_r0.r2_en_bmaf_1.majoration_par_enf_supp_a_charge * (al_nb_pac > 2) * (al_nb_pac - 2)
+            al_r0.r2_en_bmaf_1.taux3_dom * residence_dom * (al_nb_pac == 1)
+            + al_r0.r2_en_bmaf_1.personnes_isolees_ou_couples_avec_2_enf * (al_nb_pac >= 2)
+            + al_r0.r2_en_bmaf_1.majoration_par_enf_supp_a_charge * (al_nb_pac > 2) * (al_nb_pac - 2)
             )
 
         deductions = parameters(period).impot_revenu.calcul_revenus_imposables.deductions
@@ -1201,7 +1201,7 @@ def formula(famille, period, parameters):
         return R0
 
     def formula_2006(famille, period, parameters):
-        al = parameters(period).prestations_sociales.aides_logement.allocations_logement
+        al_r0 = parameters(period).prestations_sociales.aides_logement.allocations_logement.secteur_locatif.pp_participation_personnelle.r0_abattement_ressources_menage
         pfam_n_2 = parameters(period.start.offset(-2, 'year')).prestations_sociales.prestations_familiales.bmaf
         minim_n_2 = parameters(period.start.offset(-2, 'year')).prestations_sociales.solidarite_insertion.minima_sociaux
         couple = famille('al_couple', period)
@@ -1215,17 +1215,17 @@ def formula_2006(famille, period, parameters):
             montant_de_base = minim_n_2.rmi.rmi_m.montant_de_base_du_rmi
 
         R1 = montant_de_base * (
-            al.al_param_r0.r1_en_rsa_socle_1.personne_isolee * not_(couple) * (al_nb_pac == 0)
-            + al.al_param_r0.r1_en_rsa_socle_1.couple_sans_enf * couple * (al_nb_pac == 0)
-            + al.al_param_r0.r1_en_rsa_socle_1.personne_isolee_ou_couple_avec_1_enf * (al_nb_pac == 1)
-            + al.al_param_r0.r1_en_rsa_socle_1.personne_isolee_ou_couple_avec_2_enf * (al_nb_pac >= 2)
-            + al.al_param_r0.r1_en_rsa_socle_1.majoration_enfant_a_charge_supp * (al_nb_pac > 2) * (al_nb_pac - 2)
+            al_r0.r1_en_rsa_socle_1.personne_isolee * not_(couple) * (al_nb_pac == 0)
+            + al_r0.r1_en_rsa_socle_1.couple_sans_enf * couple * (al_nb_pac == 0)
+            + al_r0.r1_en_rsa_socle_1.personne_isolee_ou_couple_avec_1_enf * (al_nb_pac == 1)
+            + al_r0.r1_en_rsa_socle_1.personne_isolee_ou_couple_avec_2_enf * (al_nb_pac >= 2)
+            + al_r0.r1_en_rsa_socle_1.majoration_enfant_a_charge_supp * (al_nb_pac > 2) * (al_nb_pac - 2)
             )
 
         R2 = pfam_n_2.bmaf * (
-            al.al_param_r0.r2_en_bmaf_1.taux3_dom * residence_dom * (al_nb_pac == 1)
-            + al.al_param_r0.r2_en_bmaf_1.personnes_isolees_ou_couples_avec_2_enf * (al_nb_pac >= 2)
-            + al.al_param_r0.r2_en_bmaf_1.majoration_par_enf_supp_a_charge * (al_nb_pac > 2) * (al_nb_pac - 2)
+            al_r0.r2_en_bmaf_1.taux3_dom * residence_dom * (al_nb_pac == 1)
+            + al_r0.r2_en_bmaf_1.personnes_isolees_ou_couples_avec_2_enf * (al_nb_pac >= 2)
+            + al_r0.r2_en_bmaf_1.majoration_par_enf_supp_a_charge * (al_nb_pac > 2) * (al_nb_pac - 2)
             )
 
         abattement = parameters(period).impot_revenu.calcul_revenus_imposables.deductions.abatpro.taux
@@ -1235,20 +1235,20 @@ def formula_2006(famille, period, parameters):
 
     # cf Décret n° 2014-1739 du 29 décembre 2014 relatif au calcul des aides personnelles au logement
     def formula_2015_01_01(famille, period, parameters):
-        al = parameters(period).prestations_sociales.aides_logement.allocations_logement
+        al_r0 = parameters(period).prestations_sociales.aides_logement.allocations_logement.secteur_locatif.pp_participation_personnelle.r0_abattement_ressources_menage
         couple = famille('al_couple', period)
         al_nb_pac = famille('al_nb_personnes_a_charge', period)
 
         R0 = (
-            al.al_param_r0.r0.cas_general.taux_seul * not_(couple) * (al_nb_pac == 0)
-            + al.al_param_r0.r0.cas_general.taux_couple * couple * (al_nb_pac == 0)
-            + al.al_param_r0.r0.cas_general.taux1pac * (al_nb_pac == 1)
-            + al.al_param_r0.r0.cas_general.taux2pac * (al_nb_pac == 2)
-            + al.al_param_r0.r0.cas_general.taux3pac * (al_nb_pac == 3)
-            + al.al_param_r0.r0.cas_general.taux4pac * (al_nb_pac == 4)
-            + al.al_param_r0.r0.cas_general.taux5pac * (al_nb_pac == 5)
-            + al.al_param_r0.r0.cas_general.taux6pac * (al_nb_pac >= 6)  # la dernière valeur est un montant additionnel à rajouter pour chaque pac au-delà de 6.
-            + al.al_param_r0.r0.cas_general.taux_pac_supp * (al_nb_pac > 6) * (al_nb_pac - 6)
+            al_r0.cas_general.taux_seul * not_(couple) * (al_nb_pac == 0)
+            + al_r0.cas_general.taux_couple * couple * (al_nb_pac == 0)
+            + al_r0.cas_general.taux1pac * (al_nb_pac == 1)
+            + al_r0.cas_general.taux2pac * (al_nb_pac == 2)
+            + al_r0.cas_general.taux3pac * (al_nb_pac == 3)
+            + al_r0.cas_general.taux4pac * (al_nb_pac == 4)
+            + al_r0.cas_general.taux5pac * (al_nb_pac == 5)
+            + al_r0.cas_general.taux6pac * (al_nb_pac >= 6)  # la dernière valeur est un montant additionnel à rajouter pour chaque pac au-delà de 6.
+            + al_r0.cas_general.taux_pac_supp * (al_nb_pac > 6) * (al_nb_pac - 6)
             )
 
         return R0

diff --git a/...meters/prestations_sociales/aides_logement/allocations_logement/al_param_r0/r0/index.yaml b/...meters/prestations_sociales/aides_logement/allocations_logement/al_param_r0/r0/index.yaml
diff --git a/...ent/al_param_r0/r0/cas_general/index.yaml → ..._ressources_menage/cas_general/index.yaml b/...ent/al_param_r0/r0/cas_general/index.yaml → ..._ressources_menage/cas_general/index.yaml
diff --git a/.../al_param_r0/r0/cas_general/taux1pac.yaml → ...ssources_menage/cas_general/taux1pac.yaml b/.../al_param_r0/r0/cas_general/taux1pac.yaml → ...ssources_menage/cas_general/taux1pac.yaml
diff --git a/.../al_param_r0/r0/cas_general/taux2pac.yaml → ...ssources_menage/cas_general/taux2pac.yaml b/.../al_param_r0/r0/cas_general/taux2pac.yaml → ...ssources_menage/cas_general/taux2pac.yaml
diff --git a/.../al_param_r0/r0/cas_general/taux3pac.yaml → ...ssources_menage/cas_general/taux3pac.yaml b/.../al_param_r0/r0/cas_general/taux3pac.yaml → ...ssources_menage/cas_general/taux3pac.yaml
diff --git a/.../al_param_r0/r0/cas_general/taux4pac.yaml → ...ssources_menage/cas_general/taux4pac.yaml b/.../al_param_r0/r0/cas_general/taux4pac.yaml → ...ssources_menage/cas_general/taux4pac.yaml
diff --git a/.../al_param_r0/r0/cas_general/taux5pac.yaml → ...ssources_menage/cas_general/taux5pac.yaml b/.../al_param_r0/r0/cas_general/taux5pac.yaml → ...ssources_menage/cas_general/taux5pac.yaml
diff --git a/.../al_param_r0/r0/cas_general/taux6pac.yaml → ...ssources_menage/cas_general/taux6pac.yaml b/.../al_param_r0/r0/cas_general/taux6pac.yaml → ...ssources_menage/cas_general/taux6pac.yaml
diff --git a/..._param_r0/r0/cas_general/taux_couple.yaml → ...urces_menage/cas_general/taux_couple.yaml b/..._param_r0/r0/cas_general/taux_couple.yaml → ...urces_menage/cas_general/taux_couple.yaml
diff --git a/...aram_r0/r0/cas_general/taux_pac_supp.yaml → ...ces_menage/cas_general/taux_pac_supp.yaml b/...aram_r0/r0/cas_general/taux_pac_supp.yaml → ...ces_menage/cas_general/taux_pac_supp.yaml
diff --git a/...al_param_r0/r0/cas_general/taux_seul.yaml → ...sources_menage/cas_general/taux_seul.yaml b/...al_param_r0/r0/cas_general/taux_seul.yaml → ...sources_menage/cas_general/taux_seul.yaml
diff --git a/...locations_logement/al_param_r0/index.yaml → ...0_abattement_ressources_menage/index.yaml b/...locations_logement/al_param_r0/index.yaml → ...0_abattement_ressources_menage/index.yaml
diff --git a/...ogement/al_param_r0/r0/mayotte/index.yaml → ...ment_ressources_menage/mayotte/index.yaml b/...ogement/al_param_r0/r0/mayotte/index.yaml → ...ment_ressources_menage/mayotte/index.yaml
diff --git a/...ment/al_param_r0/r0/mayotte/taux1pac.yaml → ...t_ressources_menage/mayotte/taux1pac.yaml b/...ment/al_param_r0/r0/mayotte/taux1pac.yaml → ...t_ressources_menage/mayotte/taux1pac.yaml
diff --git a/...ment/al_param_r0/r0/mayotte/taux2pac.yaml → ...t_ressources_menage/mayotte/taux2pac.yaml b/...ment/al_param_r0/r0/mayotte/taux2pac.yaml → ...t_ressources_menage/mayotte/taux2pac.yaml
diff --git a/...ment/al_param_r0/r0/mayotte/taux3pac.yaml → ...t_ressources_menage/mayotte/taux3pac.yaml b/...ment/al_param_r0/r0/mayotte/taux3pac.yaml → ...t_ressources_menage/mayotte/taux3pac.yaml
diff --git a/...ment/al_param_r0/r0/mayotte/taux4pac.yaml → ...t_ressources_menage/mayotte/taux4pac.yaml b/...ment/al_param_r0/r0/mayotte/taux4pac.yaml → ...t_ressources_menage/mayotte/taux4pac.yaml
diff --git a/...ment/al_param_r0/r0/mayotte/taux5pac.yaml → ...t_ressources_menage/mayotte/taux5pac.yaml b/...ment/al_param_r0/r0/mayotte/taux5pac.yaml → ...t_ressources_menage/mayotte/taux5pac.yaml
diff --git a/...ment/al_param_r0/r0/mayotte/taux6pac.yaml → ...t_ressources_menage/mayotte/taux6pac.yaml b/...ment/al_param_r0/r0/mayotte/taux6pac.yaml → ...t_ressources_menage/mayotte/taux6pac.yaml
diff --git a/...t/al_param_r0/r0/mayotte/taux_couple.yaml → ...essources_menage/mayotte/taux_couple.yaml b/...t/al_param_r0/r0/mayotte/taux_couple.yaml → ...essources_menage/mayotte/taux_couple.yaml
diff --git a/...ent/al_param_r0/r0/mayotte/taux_seul.yaml → ..._ressources_menage/mayotte/taux_seul.yaml b/...ent/al_param_r0/r0/mayotte/taux_seul.yaml → ..._ressources_menage/mayotte/taux_seul.yaml
diff --git a/.../foyers_avec_1_personne_charge_en_r0.yaml → .../foyers_avec_1_personne_charge_en_r0.yaml b/.../foyers_avec_1_personne_charge_en_r0.yaml → .../foyers_avec_1_personne_charge_en_r0.yaml
diff --git a/...foyers_avec_2_personnes_charge_en_r0.yaml → ...foyers_avec_2_personnes_charge_en_r0.yaml b/...foyers_avec_2_personnes_charge_en_r0.yaml → ...foyers_avec_2_personnes_charge_en_r0.yaml
diff --git a/...foyers_avec_3_personnes_charge_en_r0.yaml → ...foyers_avec_3_personnes_charge_en_r0.yaml b/...foyers_avec_3_personnes_charge_en_r0.yaml → ...foyers_avec_3_personnes_charge_en_r0.yaml
diff --git a/...s_avec_4_personnes_charge_plus_en_r0.yaml → ...s_avec_4_personnes_charge_plus_en_r0.yaml b/...s_avec_4_personnes_charge_plus_en_r0.yaml → ...s_avec_4_personnes_charge_plus_en_r0.yaml
diff --git a/...r0/foyers_sans_personne_charge_en_r0.yaml → ...r0/foyers_sans_personne_charge_en_r0.yaml b/...r0/foyers_sans_personne_charge_en_r0.yaml → ...r0/foyers_sans_personne_charge_en_r0.yaml
diff --git a/...ogement/al_param_r0/plafond_r0/index.yaml → ...t_ressources_menage/plafond_r0/index.yaml b/...ogement/al_param_r0/plafond_r0/index.yaml → ...t_ressources_menage/plafond_r0/index.yaml
diff --git a/...r0/r1_en_rsa_socle_1/couple_sans_enf.yaml → ...ge/r1_en_rsa_socle_1/couple_sans_enf.yaml b/...r0/r1_en_rsa_socle_1/couple_sans_enf.yaml → ...ge/r1_en_rsa_socle_1/couple_sans_enf.yaml
diff --git a/.../al_param_r0/r1_en_rsa_socle_1/index.yaml → ...urces_menage/r1_en_rsa_socle_1/index.yaml b/.../al_param_r0/r1_en_rsa_socle_1/index.yaml → ...urces_menage/r1_en_rsa_socle_1/index.yaml
diff --git a/...le_1/majoration_enfant_a_charge_supp.yaml → ...le_1/majoration_enfant_a_charge_supp.yaml b/...le_1/majoration_enfant_a_charge_supp.yaml → ...le_1/majoration_enfant_a_charge_supp.yaml
diff --git a/...r0/r1_en_rsa_socle_1/personne_isolee.yaml → ...ge/r1_en_rsa_socle_1/personne_isolee.yaml b/...r0/r1_en_rsa_socle_1/personne_isolee.yaml → ...ge/r1_en_rsa_socle_1/personne_isolee.yaml
diff --git a/...personne_isolee_ou_couple_avec_1_enf.yaml → ...personne_isolee_ou_couple_avec_1_enf.yaml b/...personne_isolee_ou_couple_avec_1_enf.yaml → ...personne_isolee_ou_couple_avec_1_enf.yaml
diff --git a/...personne_isolee_ou_couple_avec_2_enf.yaml → ...personne_isolee_ou_couple_avec_2_enf.yaml b/...personne_isolee_ou_couple_avec_2_enf.yaml → ...personne_isolee_ou_couple_avec_2_enf.yaml
diff --git a/...ement/al_param_r0/r2_en_bmaf_1/index.yaml → ...ressources_menage/r2_en_bmaf_1/index.yaml b/...ement/al_param_r0/r2_en_bmaf_1/index.yaml → ...ressources_menage/r2_en_bmaf_1/index.yaml
diff --git a/...f_1/majoration_par_enf_supp_a_charge.yaml → ...f_1/majoration_par_enf_supp_a_charge.yaml b/...f_1/majoration_par_enf_supp_a_charge.yaml → ...f_1/majoration_par_enf_supp_a_charge.yaml
diff --git a/...sonnes_isolees_ou_couples_avec_2_enf.yaml → ...sonnes_isolees_ou_couples_avec_2_enf.yaml b/...sonnes_isolees_ou_couples_avec_2_enf.yaml → ...sonnes_isolees_ou_couples_avec_2_enf.yaml
diff --git a/...t/al_param_r0/r2_en_bmaf_1/taux3_dom.yaml → ...ources_menage/r2_en_bmaf_1/taux3_dom.yaml b/...t/al_param_r0/r2_en_bmaf_1/taux3_dom.yaml → ...ources_menage/r2_en_bmaf_1/taux3_dom.yaml