Rename parameters.pension to parameters.retraite

openfisca · Nov 14, 2024 · 395ae23 · 395ae23
1 parent 4c1b6fd
commit 395ae23
Show file tree

Hide file tree

Showing 22 changed files with 15 additions and 15 deletions.
diff --git a/...sia_pension/parameters/pension/index.yaml → ...ia_pension/parameters/retraite/index.yaml b/...sia_pension/parameters/pension/index.yaml → ...ia_pension/parameters/retraite/index.yaml
diff --git a/...ion/parameters/pension/rsa/age_legal.yaml → ...on/parameters/retraite/rsa/age_legal.yaml b/...ion/parameters/pension/rsa/age_legal.yaml → ...on/parameters/retraite/rsa/age_legal.yaml
diff --git a/...pension/parameters/pension/rsa/index.yaml → ...ension/parameters/retraite/rsa/index.yaml b/...pension/parameters/pension/rsa/index.yaml → ...ension/parameters/retraite/rsa/index.yaml
diff --git a/...n/parameters/pension/rsa/pension_min.yaml → .../parameters/retraite/rsa/pension_min.yaml b/...n/parameters/pension/rsa/pension_min.yaml → .../parameters/retraite/rsa/pension_min.yaml
diff --git a/...ension/rsa/periode_remplacement_base.yaml → ...traite/rsa/periode_remplacement_base.yaml b/...ension/rsa/periode_remplacement_base.yaml → ...traite/rsa/periode_remplacement_base.yaml
diff --git a/...meters/pension/rsa/plaf_taux_pension.yaml → ...eters/retraite/rsa/plaf_taux_pension.yaml b/...meters/pension/rsa/plaf_taux_pension.yaml → ...eters/retraite/rsa/plaf_taux_pension.yaml
diff --git a/.../parameters/pension/rsa/stage_requis.yaml → ...parameters/retraite/rsa/stage_requis.yaml b/.../parameters/pension/rsa/stage_requis.yaml → ...parameters/retraite/rsa/stage_requis.yaml
diff --git a/...meters/pension/rsa/taux_annuite_base.yaml → ...eters/retraite/rsa/taux_annuite_base.yaml b/...meters/pension/rsa/taux_annuite_base.yaml → ...eters/retraite/rsa/taux_annuite_base.yaml
diff --git a/...nsion/rsa/taux_annuite_supplemetaire.yaml → ...raite/rsa/taux_annuite_supplemetaire.yaml b/...nsion/rsa/taux_annuite_supplemetaire.yaml → ...raite/rsa/taux_annuite_supplemetaire.yaml
diff --git a/...ameters/pension/rsna/age_dep_anticip.yaml → ...meters/retraite/rsna/age_dep_anticip.yaml b/...ameters/pension/rsna/age_dep_anticip.yaml → ...meters/retraite/rsna/age_dep_anticip.yaml
diff --git a/...on/parameters/pension/rsna/age_legal.yaml → ...n/parameters/retraite/rsna/age_legal.yaml b/...on/parameters/pension/rsna/age_legal.yaml → ...n/parameters/retraite/rsna/age_legal.yaml
diff --git a/...ension/parameters/pension/rsna/index.yaml → ...nsion/parameters/retraite/rsna/index.yaml b/...ension/parameters/pension/rsna/index.yaml → ...nsion/parameters/retraite/rsna/index.yaml
diff --git a/.../pension/rsna/pension_minimale/index.yaml → ...retraite/rsna/pension_minimale/index.yaml b/.../pension/rsna/pension_minimale/index.yaml → ...retraite/rsna/pension_minimale/index.yaml
diff --git a/...rs/pension/rsna/pension_minimale/inf.yaml → ...s/retraite/rsna/pension_minimale/inf.yaml b/...rs/pension/rsna/pension_minimale/inf.yaml → ...s/retraite/rsna/pension_minimale/inf.yaml
diff --git a/...rs/pension/rsna/pension_minimale/sup.yaml → ...s/retraite/rsna/pension_minimale/sup.yaml b/...rs/pension/rsna/pension_minimale/sup.yaml → ...s/retraite/rsna/pension_minimale/sup.yaml
diff --git a/...nsion/rsna/periode_remplacement_base.yaml → ...raite/rsna/periode_remplacement_base.yaml b/...nsion/rsna/periode_remplacement_base.yaml → ...raite/rsna/periode_remplacement_base.yaml
diff --git a/...eters/pension/rsna/plaf_taux_pension.yaml → ...ters/retraite/rsna/plaf_taux_pension.yaml b/...eters/pension/rsna/plaf_taux_pension.yaml → ...ters/retraite/rsna/plaf_taux_pension.yaml
diff --git a/.../parameters/pension/rsna/stage_derog.yaml → ...parameters/retraite/rsna/stage_derog.yaml b/.../parameters/pension/rsna/stage_derog.yaml → ...parameters/retraite/rsna/stage_derog.yaml
diff --git a/...parameters/pension/rsna/stage_requis.yaml → ...arameters/retraite/rsna/stage_requis.yaml b/...parameters/pension/rsna/stage_requis.yaml → ...arameters/retraite/rsna/stage_requis.yaml
diff --git a/...eters/pension/rsna/taux_annuite_base.yaml → ...ters/retraite/rsna/taux_annuite_base.yaml b/...eters/pension/rsna/taux_annuite_base.yaml → ...ters/retraite/rsna/taux_annuite_base.yaml
diff --git a/...sion/rsna/taux_annuite_supplemetaire.yaml → ...aite/rsna/taux_annuite_supplemetaire.yaml b/...sion/rsna/taux_annuite_supplemetaire.yaml → ...aite/rsna/taux_annuite_supplemetaire.yaml
diff --git a/openfisca_tunisia_pension/variables/pension.py b/openfisca_tunisia_pension/variables/pension.py
@@ -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 = (
@@ -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,