Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor-param #12

Closed
wants to merge 2 commits into from
Closed

Refactor-param #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc4b535
Merge pull request #11 from openfisca/migration
benjello Nov 14, 2024
ab4ea67
Rename parameters.pension to parameters.retraite
benjello Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...sia_pension/parameters/pension/index.yaml → ...ia_pension/parameters/retraite/index.yaml
View file
Open in desktop
File renamed without changes.
0 ...ion/parameters/pension/rsa/age_legal.yaml → ...on/parameters/retraite/rsa/age_legal.yaml
View file
Open in desktop
File renamed without changes.
0 ...pension/parameters/pension/rsa/index.yaml → ...ension/parameters/retraite/rsa/index.yaml
View file
Open in desktop
File renamed without changes.
0 ...n/parameters/pension/rsa/pension_min.yaml → .../parameters/retraite/rsa/pension_min.yaml
View file
Open in desktop
File renamed without changes.
0 ...ension/rsa/periode_remplacement_base.yaml → ...traite/rsa/periode_remplacement_base.yaml
View file
Open in desktop
File renamed without changes.
0 ...meters/pension/rsa/plaf_taux_pension.yaml → ...eters/retraite/rsa/plaf_taux_pension.yaml
View file
Open in desktop
File renamed without changes.
0 .../parameters/pension/rsa/stage_requis.yaml → ...parameters/retraite/rsa/stage_requis.yaml
View file
Open in desktop
File renamed without changes.
0 ...meters/pension/rsa/taux_annuite_base.yaml → ...eters/retraite/rsa/taux_annuite_base.yaml
View file
Open in desktop
File renamed without changes.
0 ...nsion/rsa/taux_annuite_supplemetaire.yaml → ...raite/rsa/taux_annuite_supplemetaire.yaml
View file
Open in desktop
File renamed without changes.
0 ...ameters/pension/rsna/age_dep_anticip.yaml → ...meters/retraite/rsna/age_dep_anticip.yaml
View file
Open in desktop
File renamed without changes.
0 ...on/parameters/pension/rsna/age_legal.yaml → ...n/parameters/retraite/rsna/age_legal.yaml
View file
Open in desktop
File renamed without changes.
0 ...ension/parameters/pension/rsna/index.yaml → ...nsion/parameters/retraite/rsna/index.yaml
View file
Open in desktop
File renamed without changes.
0 .../pension/rsna/pension_minimale/index.yaml → ...retraite/rsna/pension_minimale/index.yaml
View file
Open in desktop
File renamed without changes.
0 ...rs/pension/rsna/pension_minimale/inf.yaml → ...s/retraite/rsna/pension_minimale/inf.yaml
View file
Open in desktop
File renamed without changes.
0 ...rs/pension/rsna/pension_minimale/sup.yaml → ...s/retraite/rsna/pension_minimale/sup.yaml
View file
Open in desktop
File renamed without changes.
0 ...nsion/rsna/periode_remplacement_base.yaml → ...raite/rsna/periode_remplacement_base.yaml
View file
Open in desktop
File renamed without changes.
0 ...eters/pension/rsna/plaf_taux_pension.yaml → ...ters/retraite/rsna/plaf_taux_pension.yaml
View file
Open in desktop
File renamed without changes.
0 .../parameters/pension/rsna/stage_derog.yaml → ...parameters/retraite/rsna/stage_derog.yaml
View file
Open in desktop
File renamed without changes.
0 ...parameters/pension/rsna/stage_requis.yaml → ...arameters/retraite/rsna/stage_requis.yaml
View file
Open in desktop
File renamed without changes.
0 ...eters/pension/rsna/taux_annuite_base.yaml → ...ters/retraite/rsna/taux_annuite_base.yaml
View file
Open in desktop
File renamed without changes.
0 ...sion/rsna/taux_annuite_supplemetaire.yaml → ...aite/rsna/taux_annuite_supplemetaire.yaml
View file
Open in desktop
File renamed without changes.
30 changes: 15 additions & 15 deletions openfisca_tunisia_pension/variables/pension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@ def formula(individu, period, parameters):
salaire_reference = individu('salaire_reference_rsna', period = period)
age = individu('age', period = period)

taux_annuite_base = parameters(period).pension.rsna.taux_annuite_base
taux_annuite_supplemetaire = parameters(period).pension.rsna.taux_annuite_supplemetaire
duree_stage = parameters(period).pension.rsna.stage_derog
age_eligible = parameters(period).pension.rsna.age_dep_anticip
periode_remplacement_base = parameters(period).pension.rsna.periode_remplacement_base
plaf_taux_pension = parameters(period).pension.rsna.plaf_taux_pension
taux_annuite_base = parameters(period).retraite.rsna.taux_annuite_base
taux_annuite_supplemetaire = parameters(period).retraite.rsna.taux_annuite_supplemetaire
duree_stage = parameters(period).retraite.rsna.stage_derog
age_eligible = parameters(period).retraite.rsna.age_dep_anticip
periode_remplacement_base = parameters(period).retraite.rsna.periode_remplacement_base
plaf_taux_pension = parameters(period).retraite.rsna.plaf_taux_pension
smig = parameters(period).marche_travail.smig_48h

pension_min_sup = parameters(period).pension.rsna.pension_minimale.sup
pension_min_inf = parameters(period).pension.rsna.pension_minimale.inf
pension_min_sup = parameters(period).retraite.rsna.pension_minimale.sup
pension_min_inf = parameters(period).retraite.rsna.pension_minimale.inf

stage = trimestres_valides > 4 * duree_stage
pension_minimale = (
Expand Down Expand Up @@ -115,15 +115,15 @@ def _pension_rsa(trimestres_valides, sal_ref_rsa, regime, age, parameters):
'''
Pension du régime des salariés agricoles
'''
taux_annuite_base = parameters.pension.rsa.taux_annuite_base
taux_annuite_supplemetaire = parameters.pension.rsa.taux_annuite_supplemetaire
duree_stage = parameters.pension.rsa.stage_requis
age_elig = parameters.pension.rsa.age_legal
periode_remplacement_base = parameters.pension.rsa.periode_remplacement_base
plaf_taux_pension = parameters.pension.rsa.plaf_taux_pension
taux_annuite_base = parameters.retraite.rsa.taux_annuite_base
taux_annuite_supplemetaire = parameters.retraite.rsa.taux_annuite_supplemetaire
duree_stage = parameters.retraite.rsa.stage_requis
age_elig = parameters.retraite.rsa.age_legal
periode_remplacement_base = parameters.retraite.rsa.periode_remplacement_base
plaf_taux_pension = parameters.retraite.rsa.plaf_taux_pension
smag = parameters.marche_travail.smag * 25
stage = trimestres_valides > 4 * duree_stage
pension_min = parameters.pension.rsa.pension_min
pension_min = parameters.retraite.rsa.pension_min
sal_ref = sal_ref_rsa

montant = pension_generique(trimestres_valides, sal_ref, age, taux_annuite_base, taux_annuite_supplemetaire,
Expand Down
Loading