From bbe4f4e7a33d72ab313479b443d90d3abca0ca68 Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Mon, 3 Feb 2025 21:43:45 +0100 Subject: [PATCH 1/4] Separe revenu ame_social --- .../prestations/non_contributives/amen_social.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/openfisca_tunisia/variables/prestations/non_contributives/amen_social.py b/openfisca_tunisia/variables/prestations/non_contributives/amen_social.py index 23d36a88..d35a4d00 100644 --- a/openfisca_tunisia/variables/prestations/non_contributives/amen_social.py +++ b/openfisca_tunisia/variables/prestations/non_contributives/amen_social.py @@ -47,7 +47,7 @@ def formula_2020(menage, period, parameters): # Citère du revenu selon présence ou non de handicap lourd presence_handicap_lourd = menage('amen_social_presence_handicap_lourd', period) taille_menage = menage.nb_persons() - revenu_menage = menage.sum(menage.members('salaire_net_a_payer', period)) # Corriger les revenus + revenu_menage = menage('amen_social_revenu', period) seuil_de_revenu = parameters(period).prestations.non_contributives.amen_social.eligibilite smig_mensuel = parameters(period.start).marche_travail.smig_40h_mensuel conditions_sans_handicap = [ @@ -84,6 +84,19 @@ def formula_2020(menage, period, parameters): return pas_d_achat_onereux * pas_de_residence_secondaire * critere_revenu +class amen_social_revenu(Variable): + value_type = bool + entity = Menage + label = 'Revenu du ménage au sens du programme Amen social' + definition_period = MONTH + + def formula_2020(menage, period, parameters): + revenu_menage = ( + menage.sum(menage.members('salaire_net_a_payer', period)) + + menage.sum(menage.members('pension_de_retraite', period)) + ) + return revenu_menage + class transfert_monetaire_permanent_eligible(Variable): value_type = bool entity = Menage From ba9e350de64d1a941eb56c549f23a4de87cedd41 Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Tue, 4 Feb 2025 17:35:11 +0100 Subject: [PATCH 2/4] Bump --- CHANGELOG.md | 8 ++++++++ pyproject.toml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e96d2b40..e3c4ffe3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 0.47 - [#191](https://github.com/openfisca/openfisca-tunisia/pull/191) + +* Évolution du système socio-fiscal. . +* Périodes concernées : toutes. +* Zones impactées : `variables/prestations/non_contributives/amen_social.py`. +* Détails : + - Introduit `amen_social_revenu` + ## 0.46 - [#191](https://github.com/openfisca/openfisca-tunisia/pull/191) * Évolution du système socio-fiscal. . diff --git a/pyproject.toml b/pyproject.toml index b59dc93e..2c85a789 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "OpenFisca-Tunisia" -version = "0.46" +version = "0.47" description = "OpenFisca Rules as Code model for Tunisia." readme = "README.md" keywords = ["microsimulation", "tax", "benefit", "rac", "rules-as-code", "tunisia"] From a4f99fa11be92aa2705fe50ecdfe891c9b5276de Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Tue, 4 Feb 2025 17:40:14 +0100 Subject: [PATCH 3/4] Typo --- .../variables/prestations/non_contributives/amen_social.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openfisca_tunisia/variables/prestations/non_contributives/amen_social.py b/openfisca_tunisia/variables/prestations/non_contributives/amen_social.py index d35a4d00..5b6f47e8 100644 --- a/openfisca_tunisia/variables/prestations/non_contributives/amen_social.py +++ b/openfisca_tunisia/variables/prestations/non_contributives/amen_social.py @@ -97,6 +97,7 @@ def formula_2020(menage, period, parameters): ) return revenu_menage + class transfert_monetaire_permanent_eligible(Variable): value_type = bool entity = Menage From 3b1b0537f3578c343cf11d6ba6dedc680d39ac03 Mon Sep 17 00:00:00 2001 From: Mahdi Ben Jelloul Date: Tue, 4 Feb 2025 16:51:10 +0100 Subject: [PATCH 4/4] Fix amen_social_revenu --- .../variables/prestations/non_contributives/amen_social.py | 2 +- tests/formulas/amen_social/eligibilite.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/openfisca_tunisia/variables/prestations/non_contributives/amen_social.py b/openfisca_tunisia/variables/prestations/non_contributives/amen_social.py index 5b6f47e8..29f59a1a 100644 --- a/openfisca_tunisia/variables/prestations/non_contributives/amen_social.py +++ b/openfisca_tunisia/variables/prestations/non_contributives/amen_social.py @@ -85,7 +85,7 @@ def formula_2020(menage, period, parameters): class amen_social_revenu(Variable): - value_type = bool + value_type = float entity = Menage label = 'Revenu du ménage au sens du programme Amen social' definition_period = MONTH diff --git a/tests/formulas/amen_social/eligibilite.yaml b/tests/formulas/amen_social/eligibilite.yaml index af15b199..df1e3bcd 100644 --- a/tests/formulas/amen_social/eligibilite.yaml +++ b/tests/formulas/amen_social/eligibilite.yaml @@ -89,10 +89,15 @@ date_naissance: 2015-01-01 eleve: 2022: true + enfant3: + date_naissance: 2020-01-01 + eleve: + 2022: true menage: personne_de_reference: parent1 enfants: - enfant1 - enfant2 + - enfant3 output: amen_social_eligible: false