From 99025a9b46eb3ed177d25bf46fc4ba2f5406933c Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Sat, 30 Nov 2024 00:11:51 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Reorganise=20les=20varaibles=20et=20les=20p?= =?UTF-8?q?aram=C3=A8tres?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prestations/non_contributives/allocation_familiale.yaml | 6 ++++++ .../amen_social/eligibilite/deux_membres.yaml | 2 +- .../amen_social/eligibilite/handicap_lourd.yaml | 2 +- .../non_contributives/amen_social/eligibilite/index.yaml | 3 ++- .../amen_social/eligibilite/plus_de_cinq_membres.yaml | 2 +- .../amen_social/eligibilite/trois_quatre_membres.yaml | 2 +- .../amen_social/eligibilite/un_membre.yaml | 2 +- .../non_contributives/amen_social/supplements/index.yaml | 2 +- .../parameters/retraite/rsna/pension_minimale/inf.yaml | 2 +- .../parameters/retraite/rsna/pension_minimale/sup.yaml | 2 +- 10 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 openfisca_tunisia/parameters/prestations/non_contributives/allocation_familiale.yaml diff --git a/openfisca_tunisia/parameters/prestations/non_contributives/allocation_familiale.yaml b/openfisca_tunisia/parameters/prestations/non_contributives/allocation_familiale.yaml new file mode 100644 index 00000000..2a27bd5f --- /dev/null +++ b/openfisca_tunisia/parameters/prestations/non_contributives/allocation_familiale.yaml @@ -0,0 +1,6 @@ +description: Montant de l'allocation familiale non contributive +values: + 2020-06-01: + value: 30 +metadata: + unit: currency diff --git a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/deux_membres.yaml b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/deux_membres.yaml index eac45c0c..f47ee6a5 100644 --- a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/deux_membres.yaml +++ b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/deux_membres.yaml @@ -4,7 +4,7 @@ values: value: 1 metadata: short_label: Deux personnes - unit: Smig + unit: smig reference: 2020-01-01: title: Décret 2020-317 du 19 mai 2020 diff --git a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/handicap_lourd.yaml b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/handicap_lourd.yaml index 96164e02..a9e3d52b 100644 --- a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/handicap_lourd.yaml +++ b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/handicap_lourd.yaml @@ -4,7 +4,7 @@ values: value: .5 metadata: short_label: Handicap lourd - unit: Smig + unit: smig reference: 2020-01-01: title: Décret 2020-317 du 19 mai 2020 diff --git a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/index.yaml b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/index.yaml index cd88d212..f96629f3 100644 --- a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/index.yaml +++ b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/index.yaml @@ -4,4 +4,5 @@ metadata: - un_membre - deux_membres - trois_quatre_membres - - plus_de_5_membres + - plus_de_cinq_membres + - handicap_lourd diff --git a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/plus_de_cinq_membres.yaml b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/plus_de_cinq_membres.yaml index d8d81a45..adceb905 100644 --- a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/plus_de_cinq_membres.yaml +++ b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/plus_de_cinq_membres.yaml @@ -4,7 +4,7 @@ values: value: 2 metadata: short_label: Plus de cinq personnes - unit: Smig + unit: smig reference: 2020-01-01: title: Décret 2020-317 du 19 mai 2020 diff --git a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/trois_quatre_membres.yaml b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/trois_quatre_membres.yaml index 2b893292..ead537c6 100644 --- a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/trois_quatre_membres.yaml +++ b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/trois_quatre_membres.yaml @@ -4,7 +4,7 @@ values: value: 1.5 metadata: short_label: Trois ou quatre personnes - unit: Smig + unit: smig reference: 2020-01-01: title: Décret 2020-317 du 19 mai 2020 diff --git a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/un_membre.yaml b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/un_membre.yaml index 3301184d..6bbcebae 100644 --- a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/un_membre.yaml +++ b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/eligibilite/un_membre.yaml @@ -4,7 +4,7 @@ values: value: .66 metadata: short_label: Une persone - unit: Smig + unit: smig reference: 2020-01-01: title: Décret 2020-317 du 19 mai 2020 diff --git a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/supplements/index.yaml b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/supplements/index.yaml index bc6aefce..59c01ad7 100644 --- a/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/supplements/index.yaml +++ b/openfisca_tunisia/parameters/prestations/non_contributives/amen_social/supplements/index.yaml @@ -2,7 +2,7 @@ description: Suppléments et majoration de l'allocatotion Amen social metadata: short_label: Suppléments et majoration order: - - personne_a_charge + - enfant_a_charge - limite_age_enfant - limite_age_etudiant - handicap diff --git a/openfisca_tunisia/parameters/retraite/rsna/pension_minimale/inf.yaml b/openfisca_tunisia/parameters/retraite/rsna/pension_minimale/inf.yaml index 56c1af8c..5df32b90 100644 --- a/openfisca_tunisia/parameters/retraite/rsna/pension_minimale/inf.yaml +++ b/openfisca_tunisia/parameters/retraite/rsna/pension_minimale/inf.yaml @@ -4,4 +4,4 @@ values: 1974-01-01: value: 0.5 metadata: - unit: Smig + unit: smig diff --git a/openfisca_tunisia/parameters/retraite/rsna/pension_minimale/sup.yaml b/openfisca_tunisia/parameters/retraite/rsna/pension_minimale/sup.yaml index 6c6433d1..e2586357 100644 --- a/openfisca_tunisia/parameters/retraite/rsna/pension_minimale/sup.yaml +++ b/openfisca_tunisia/parameters/retraite/rsna/pension_minimale/sup.yaml @@ -4,4 +4,4 @@ values: 1974-01-01: value: 0.66666 metadata: - unit: Smig + unit: smig From 7105ea9c9d252e81f831f07866990a3d86a11fa6 Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Wed, 4 Dec 2024 17:40:21 +0100 Subject: [PATCH 2/3] Fix params --- CHANGELOG.md | 8 ++++++++ pyproject.toml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf89a025..50f26e62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### 0.41.1 - [#175](https://github.com/openfisca/openfisca-tunisia/pull/175) + +* Évolution du système socio-fiscal. +* Périodes concernées : toutes. +* Zones impactées : `prestations/non_contributives`. +* Détails : + - Corrige certains attributs des paramètres + ## 0.41.0 - [#174](https://github.com/openfisca/openfisca-tunisia/pull/174) * Évolution du système socio-fiscal. diff --git a/pyproject.toml b/pyproject.toml index ab1057a4..da3d6010 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "OpenFisca-Tunisia" -version = "0.41.0" +version = "0.41.1" description = "OpenFisca Rules as Code model for Tunisia." readme = "README.md" keywords = ["microsimulation", "tax", "benefit", "rac", "rules-as-code", "tunisia"] From 7c9d5a820021a76b9bc84fde9f07a5a0be7db9ee Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Wed, 4 Dec 2024 17:43:57 +0100 Subject: [PATCH 3/3] Remove unused file --- .../prestations/non_contributives/allocations_familiales | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 openfisca_tunisia/parameters/prestations/non_contributives/allocations_familiales diff --git a/openfisca_tunisia/parameters/prestations/non_contributives/allocations_familiales b/openfisca_tunisia/parameters/prestations/non_contributives/allocations_familiales deleted file mode 100644 index e69de29b..00000000