diff --git a/openfisca_france_data/common.py b/openfisca_france_data/common.py index 065166c5..c4170f2b 100644 --- a/openfisca_france_data/common.py +++ b/openfisca_france_data/common.py @@ -408,11 +408,10 @@ def create_traitement_indiciaire_brut(individus, period = None, revenu_type = 'i individus['primes_fonction_publique'] = TAUX_DE_PRIME * traitement_indiciaire_brut -def create_revenus_remplacement_bruts(individus, period, tax_benefit_system, revenu_type = 'net'): +def create_chomage_brut(individus, period, tax_benefit_system, revenu_type = 'net'): assert 'taux_csg_remplacement' in individus individus.chomage_imposable.fillna(0, inplace = True) - individus.retraite_imposable.fillna(0, inplace = True) if revenu_type == 'imposable': assert 'salaire_imposable' in individus.columns salaire_pour_inversion = individus.salaire_imposable @@ -468,6 +467,10 @@ def create_revenus_remplacement_bruts(individus, period, tax_benefit_system, rev ) assert individus['chomage_brut'].notnull().all() +def create_retraite_brute(individus, period, tax_benefit_system, revenu_type = 'net'): + + individus.retraite_imposable.fillna(0, inplace = True) + parameters = tax_benefit_system.get_parameters_at_instant(period.start) csg_deductible_retraite = parameters.prelevements_sociaux.contributions_sociales.csg.remplacement.pensions_retraite_invalidite.deductible taux_plein = csg_deductible_retraite.taux_plein taux_reduit = csg_deductible_retraite.taux_reduit diff --git a/openfisca_france_data/dads/input_data_builder/create_variables_individuelles.py b/openfisca_france_data/dads/input_data_builder/create_variables_individuelles.py index 9ae3ab70..e1a5015e 100644 --- a/openfisca_france_data/dads/input_data_builder/create_variables_individuelles.py +++ b/openfisca_france_data/dads/input_data_builder/create_variables_individuelles.py @@ -2,7 +2,8 @@ from openfisca_france_data.common import ( create_salaire_de_base, create_traitement_indiciaire_brut, - create_revenus_remplacement_bruts, + create_chomage_brut, + create_retraite_brute, ) @@ -47,8 +48,9 @@ def create_individu_variables_brutes( create_taux_csg_remplacement(individus, period, tax_benefit_system) created_variables.append('taux_csg_remplacement') - create_revenus_remplacement_bruts(individus, period, tax_benefit_system, revenu_type = revenu_type) + create_chomage_brut(individus, period, tax_benefit_system, revenu_type = revenu_type) created_variables.append('chomage_brut') + create_retraite_brute(individus, period, tax_benefit_system, revenu_type = revenu_type) created_variables.append('retraite_brute') return created_variables