diff --git a/openfisca_france/model/prestations/aides_logement.py b/openfisca_france/model/prestations/aides_logement.py index 383287529d..d6eb5d10ff 100644 --- a/openfisca_france/model/prestations/aides_logement.py +++ b/openfisca_france/model/prestations/aides_logement.py @@ -137,7 +137,7 @@ def formula_2016_07_01(famille, period, parameters): zone_apl = famille.demandeur.menage('zone_apl', period) loyer_plafond = famille('aide_logement_loyer_plafond', period) - coefficients = parameters(period).prestations_sociales.aides_logement.allocations_logement.al_loc2.coefficients_degressivite_suppression[zone_apl] + coefficients = parameters(period).prestations_sociales.aides_logement.allocations_logement.secteur_locatif.coefficients_degressivite_suppression[zone_apl] loyer_degressivite = round_(loyer_plafond * (coefficients.degressivite), 2) loyer_suppression = round_(loyer_plafond * (coefficients.suppression), 2) diff --git a/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/index.yaml b/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/index.yaml similarity index 100% rename from openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/index.yaml rename to openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/index.yaml diff --git a/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_1/degressivite.yaml b/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_1/degressivite.yaml similarity index 100% rename from openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_1/degressivite.yaml rename to openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_1/degressivite.yaml diff --git a/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_1/index.yaml b/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_1/index.yaml similarity index 100% rename from openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_1/index.yaml rename to openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_1/index.yaml diff --git a/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_1/suppression.yaml b/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_1/suppression.yaml similarity index 100% rename from openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_1/suppression.yaml rename to openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_1/suppression.yaml diff --git a/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_2/degressivite.yaml b/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_2/degressivite.yaml similarity index 100% rename from openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_2/degressivite.yaml rename to openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_2/degressivite.yaml diff --git a/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_2/index.yaml b/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_2/index.yaml similarity index 100% rename from openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_2/index.yaml rename to openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_2/index.yaml diff --git a/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_2/suppression.yaml b/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_2/suppression.yaml similarity index 100% rename from openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_2/suppression.yaml rename to openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_2/suppression.yaml diff --git a/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_3/degressivite.yaml b/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_3/degressivite.yaml similarity index 100% rename from openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_3/degressivite.yaml rename to openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_3/degressivite.yaml diff --git a/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_3/index.yaml b/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_3/index.yaml similarity index 100% rename from openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_3/index.yaml rename to openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_3/index.yaml diff --git a/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_3/suppression.yaml b/openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_3/suppression.yaml similarity index 100% rename from openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/al_loc2/coefficients_degressivite_suppression/zone_3/suppression.yaml rename to openfisca_france/parameters/prestations_sociales/aides_logement/allocations_logement/secteur_locatif/coefficients_degressivite_suppression/zone_3/suppression.yaml