OpenFisca-France 168.0.15__py3-none-any.whl → 168.0.16__py3-none-any.whl

{OpenFisca_France-168.0.15.data → OpenFisca_France-168.0.16.data}/data/share/openfisca/openfisca-france/CHANGELOG.md

@@ -1,22 +1,32 @@
 # Changelog
 
+## 168.0.16 [2337](https://github.com/openfisca/openfisca-france/pull/2337)
+
+* Évolution du système socio-fiscal.
+* Périodes concernées : À partir du 2024/10/01.
+* Zones impactées :
+    - `openfisca_france/model/prestations/minima_sociaux/ppa.py.`
+    - `openfisca_france/model/prestations/minima_sociaux/rsa.py.`
+* Détails :
+    - Modification de la période de référence pour les aides RSA et PPA
+    - Refactoring du code de ces méthodes pour éviter la duplication de code
+
 ## 168.0.15 [2348](https://github.com/openfisca/openfisca-france/pull/2349)
 
 * Évolution du système socio-fiscal changement mineur.
-* Périodes concernées :  01/01/2023.
+* Périodes concernées : 01/01/2023.
 * Zones impactées : `openfisca_france/parameters/impot_revenu/bareme_ir_depuis_1945/bareme.yaml`.
 * Détails : Ajoute référence 2024 article codifié impôt sur le revenu
-  
+
 ## 168.0.14 [2348](https://github.com/openfisca/openfisca-france/pull/2348)
 
 * Changement mineur : Modification d'un label
-* Périodes concernées : toutes. 
+* Périodes concernées : toutes.
 * Zones impactées : `openfisca_france/model/revenus/activite/salarie.py`.
 * Détails : La variable `contrat_de_travail` et la variable `contrat_de_travail_type` ont le même label, pourtant elles ne représentent pas la même chose. La première concerne les types de durées de travail du contrat (Temps plein, partiel, convention, etc.) ; la seconde, le type de contrat (CDD,CDI). Cette PR change le label de la première et propose de parler de "Type de durée de travail" pour les distinguer.
 
 [Service-Public.fr](https://www.service-public.fr/particuliers/vosdroits/F19261) en parle aussi sous cette forme.
 
-
 ## 168.0.13 [2344](https://github.com/openfisca/openfisca-france/pull/2344)
 
 * Évolution du système socio-fiscal. | Amélioration technique. Ces changements modifient l'API publique d'OpenFisca France et ajoutent une fonctionnalité : la possibilité de modifier des paramètres actuellement en dur dans les formules.

{OpenFisca_France-168.0.15.dist-info → OpenFisca_France-168.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenFisca-France
-Version: 168.0.15
+Version: 168.0.16
 Summary: French tax and benefit system for OpenFisca
 Home-page: https://github.com/openfisca/openfisca-france
 Author: OpenFisca Team

{OpenFisca_France-168.0.15.dist-info → OpenFisca_France-168.0.16.dist-info}/RECORD

@@ -1,5 +1,5 @@
-OpenFisca_France-168.0.15.data/data/share/openfisca/openfisca-france/CHANGELOG.md,sha256=P8xWr6rU6BbP-qAwCwPfcnMQVUlBFaS_gsspGJqOXqw,452700
-OpenFisca_France-168.0.15.data/data/share/openfisca/openfisca-france/README.md,sha256=nIa6V4zevZpj2DX1rcpgs6AATTerCCy4622S1D3-CDI,18642
+OpenFisca_France-168.0.16.data/data/share/openfisca/openfisca-france/CHANGELOG.md,sha256=S28CRva_q--UVjfh3HyJMIJicKuLsftifXIa8V0Xdjc,453183
+OpenFisca_France-168.0.16.data/data/share/openfisca/openfisca-france/README.md,sha256=nIa6V4zevZpj2DX1rcpgs6AATTerCCy4622S1D3-CDI,18642
 openfisca_france/__init__.py,sha256=MHLZ0V8uQHi4lkZ5bPAoLjsWTJe-wJgLfPxFvbCCxHc,126
 openfisca_france/entities.py,sha256=nGl52ncj9wZzFwASKZk4_OHzhqOUuXGBxNmIiwxZU-c,2576
 openfisca_france/france_taxbenefitsystem.py,sha256=UHVqvkqqYk-9RanSPWlVy3uieG77GCSrWCOqVpeN30I,1687
@@ -117,8 +117,8 @@ openfisca_france/model/prestations/minima_sociaux/aefa.py,sha256=mXOBJgXTl_iA6aa
 openfisca_france/model/prestations/minima_sociaux/anciens_ms.py,sha256=PAXVlfd8PNXR_cUyf31BUsVJ8-KTTP3Tx6CD7rRLBEw,10878
 openfisca_france/model/prestations/minima_sociaux/asi_aspa.py,sha256=abhKjQrYylUbi5Q78JL5yx0WoVtjejVWfi13FoHxnvI,20771
 openfisca_france/model/prestations/minima_sociaux/ass.py,sha256=lFizKYXWihH7L5jEQpHvaK-61DmxlcX0r4QoWuuG5YU,11221
-openfisca_france/model/prestations/minima_sociaux/ppa.py,sha256=Z7ot3ARi1y0u-DB-VTSBro8Wgw77i4qk62VEnzMeWrs,24565
-openfisca_france/model/prestations/minima_sociaux/rsa.py,sha256=v1k5e5aFqzd-cEmRm16fbGgiwXcVbbGdv3FRljuW1Go,44878
+openfisca_france/model/prestations/minima_sociaux/ppa.py,sha256=gIyPvU4gv2x-uZIDFLP92YbueuHB4ubNSMMlfeSDHg8,25064
+openfisca_france/model/prestations/minima_sociaux/rsa.py,sha256=65MdN4QZ1rms0vcTwZlSXis2HpQfK5_vE18PIFGvudw,47257
 openfisca_france/model/prestations/minima_sociaux/cs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openfisca_france/model/prestations/minima_sociaux/cs/acs.py,sha256=nwihxwsjKAmgPBW3jB2GcCSOxWJuQKgNhTj_gLZ-xAw,2435
 openfisca_france/model/prestations/minima_sociaux/cs/cmu.py,sha256=b-voxJzetykcF0WMA_cLebBQRd53Y9Z-xQGOA3jpvPk,11718
@@ -4025,8 +4025,8 @@ tests/test_parameters.py,sha256=9ByrtcJpaV32qCE-u4FY4fzCugFUW8utc5_KUAmYKG8,354
 tests/test_preprocessing.py,sha256=BBMFR4GlFFqu86XfVcrHRbps_SpoWb1QS1lmu3c5bCE,6973
 tests/test_scenarios.py,sha256=A7SmVt_iyDTbNTE45WgGQlQZkJ0uJ1ZGUhTV3ziwLUw,1009
 tests/test_tax_rates.py,sha256=B_CnSIqCijGYkKW7XVZlF8uot0otNJ-Sq-DKINPATfA,1551
-OpenFisca_France-168.0.15.dist-info/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
-OpenFisca_France-168.0.15.dist-info/METADATA,sha256=nc_t4OJXlHxiXld9_WDhcEjidslBtno4Y5Dc1Wvmf20,20518
-OpenFisca_France-168.0.15.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-OpenFisca_France-168.0.15.dist-info/top_level.txt,sha256=hmd7WhmLN_CyB52sP702pN9WlJqO9YMVuzeBRNp3hfs,23
-OpenFisca_France-168.0.15.dist-info/RECORD,,
+OpenFisca_France-168.0.16.dist-info/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
+OpenFisca_France-168.0.16.dist-info/METADATA,sha256=6vtXGu8B32AATtvWG9kOTtCjSXDC4_flgqnZJ781v00,20518
+OpenFisca_France-168.0.16.dist-info/WHEEL,sha256=5Mi1sN9lKoFv_gxcPtisEVrJZihrm_beibeg5R6xb4I,91
+OpenFisca_France-168.0.16.dist-info/top_level.txt,sha256=hmd7WhmLN_CyB52sP702pN9WlJqO9YMVuzeBRNp3hfs,23
+OpenFisca_France-168.0.16.dist-info/RECORD,,

{OpenFisca_France-168.0.15.dist-info → OpenFisca_France-168.0.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

openfisca_france/model/prestations/minima_sociaux/ppa.py

@@ -502,15 +502,11 @@ class ppa(Variable):
     # Prime pour l'Activité sur service-public.fr
     reference = 'https://www.service-public.fr/particuliers/vosdroits/F2882'
 
-    def formula_2016_01_01(famille, period, parameters):
-        seuil_non_versement = parameters(period).prestations_sociales.solidarite_insertion.minima_sociaux.ppa.pa_m.montant_minimum_verse
-        # éligibilité étudiants
-
-        ppa_eligibilite_etudiants = famille('ppa_eligibilite_etudiants', period)
-        ppa = famille('ppa_fictive', period.last_3_months, options = [ADD]) / 3
-        ppa = ppa * ppa_eligibilite_etudiants * (ppa >= seuil_non_versement)
+    def formula_2024_10(famille, period, parameters):
+        return ppa_base_formula(famille=famille, parameters=parameters, period=period, three_months_of_reference=last_3_months_offset_minus_1(period))
 
-        return ppa
+    def formula_2016_01_01(famille, period, parameters):
+        return ppa_base_formula(famille=famille, parameters=parameters, period=period, three_months_of_reference=period.last_3_months)
 
 
 class crds_ppa(Variable):
@@ -576,3 +572,18 @@ class ppa_versee(Variable):
             + famille('ppa', period.last_month) * (remainder == 1)
             + famille('ppa', period.last_month.last_month) * (remainder == 2)
             )
+
+
+def last_3_months_offset_minus_1(period) -> Period:
+    return period.last_month.last_3_months
+
+
+def ppa_base_formula(famille, parameters, period, three_months_of_reference):
+    seuil_non_versement = parameters(period).prestations_sociales.solidarite_insertion.minima_sociaux.ppa.pa_m.montant_minimum_verse
+    # éligibilité étudiants
+
+    ppa_eligibilite_etudiants = famille('ppa_eligibilite_etudiants', period)
+    ppa = famille('ppa_fictive', three_months_of_reference, options = [ADD]) / 3
+    ppa = ppa * ppa_eligibilite_etudiants * (ppa >= seuil_non_versement)
+
+    return ppa

openfisca_france/model/prestations/minima_sociaux/rsa.py

@@ -1,7 +1,6 @@
 from numpy import datetime64, logical_and as and_, logical_or as or_
 
 from openfisca_core.periods import Period
-
 from openfisca_france.model.base import *
 from openfisca_france.model.prestations.prestations_familiales.base_ressource import nb_enf
 
@@ -79,58 +78,11 @@ class rsa_base_ressources_individu(Variable):
     set_input = set_input_divide_by_period
     reference = 'https://www.legifrance.gouv.fr/affichCodeArticle.do?cidTexte=LEGITEXT000006073189&idArticle=LEGIARTI000036393176&dateTexte=&categorieLien=id'
 
-    def formula_2009_06_01(individu, period, parameters):
-        # Revenus professionels
-        types_revenus_pros = [
-            'chomage_net',
-            'retraite_nette',
-            ]
-
-        possede_ressources_substitution = individu('rsa_has_ressources_substitution', period)
-
-        # Les revenus pros interrompus au mois M sont neutralisés s'il n'y a pas de revenus de substitution.
-        revenus_pro = sum(
-            individu(type_revenu, period.last_3_months, options = [ADD]) * not_(
-                (individu(type_revenu, period) == 0)
-                * (individu(type_revenu, period.last_month) > 0)
-                * not_(possede_ressources_substitution)
-                )
-            for type_revenu in types_revenus_pros
-            )
-
-        types_revenus_non_pros = [
-            'allocation_securisation_professionnelle',
-            'dedommagement_victime_amiante',
-            'gains_exceptionnels',
-            'pensions_alimentaires_percues',
-            'pensions_invalidite',
-            'prestation_compensatoire',
-            'prime_forfaitaire_mensuelle_reprise_activite',
-            'rsa_base_ressources_patrimoine_individu',
-            'rsa_indemnites_journalieres_hors_activite',
-            ]
-
-        # Les revenus non-pro interrompus au mois M sont neutralisés dans la limite d'un montant forfaitaire,
-        # sans condition de revenu de substitution.
-        montant_de_base_du_rsa = parameters(period).prestations_sociales.solidarite_insertion.minima_sociaux.rsa.rsa_m.montant_de_base_du_rsa
-        montant_forfaitaire_neutralisation = 3 * montant_de_base_du_rsa
-        revenus_non_pros = sum(
-            max_(
-                0,
-                individu(type_revenu, period.last_3_months, options = [ADD])
-                - (
-                    montant_forfaitaire_neutralisation
-                    * (individu(type_revenu, period) == 0)
-                    * (individu(type_revenu, period.last_month) > 0)
-                    )
-                )
-            for type_revenu in types_revenus_non_pros
-            )
-
-        rentes_viageres = individu.foyer_fiscal('rente_viagere_titre_onereux', period.last_3_months, options = [ADD])
-        revenus_foyer_fiscal_projetes = rentes_viageres * individu.has_role(FoyerFiscal.DECLARANT_PRINCIPAL)
+    def formula_2024_10(individu, period, parameters):
+        return rsa_base_ressources_individu_base_formula(individu= individu, period= period, three_months_of_reference= last_3_months_offset_minus_1(period), parameters=parameters)
 
-        return (revenus_pro + revenus_non_pros + revenus_foyer_fiscal_projetes) / 3
+    def formula_2009_06_01(individu, period, parameters):
+        return rsa_base_ressources_individu_base_formula(individu= individu, period= period, three_months_of_reference= period.last_3_months, parameters=parameters)
 
     def formula(individu, period, parameters):
         # Revenus professionels
@@ -193,15 +145,13 @@ class rsa_base_ressources_minima_sociaux(Variable):
     definition_period = MONTH
     set_input = set_input_divide_by_period
 
+    def formula_2024_10(famille, period):
+        three_months_of_reference = last_3_months_offset_minus_1(period)
+        return calcul_minima_sociaux(famille= famille, period= period, three_months_of_reference=three_months_of_reference)
+
     def formula(famille, period):
         three_previous_months = period.last_3_months
-        aspa = famille('aspa', period)
-
-        ass_i = famille.members('ass', three_previous_months, options = [ADD])
-        aah_i = famille.members('aah', three_previous_months, options = [ADD])
-        asi_i = famille.members('asi', three_previous_months, options = [ADD])
-        caah_i = famille.members('caah', three_previous_months, options = [ADD])
-        return aspa + famille.sum(ass_i + aah_i + asi_i + caah_i) / 3
+        return calcul_minima_sociaux(famille= famille, period= period, three_months_of_reference=three_previous_months)
 
 
 class rsa_base_ressources_prestations_familiales(Variable):
@@ -527,43 +477,13 @@ class rsa_revenu_activite_individu(Variable):
     definition_period = MONTH
     set_input = set_input_divide_by_period
 
+    def formula_2024_10(individu, period):
+        period_m2_m4 = last_3_months_offset_minus_1(period)
+        return rsa_revenu_activite_individu_base_formula(individu= individu, period=period, three_months_of_reference=period_m2_m4)
+
     def formula_2009_06(individu, period):
         last_3_months = period.last_3_months
-
-        # Note Auto-entrepreneurs:
-        # D'après les caisses, le revenu pris en compte pour les AE pour le RSA ne prend en compte que
-        # l'abattement standard sur le CA, mais pas les cotisations pour charges sociales.
-
-        types_revenus_activite = [
-            'salaire_net',
-            'indemnites_chomage_partiel',
-            'remuneration_apprenti',
-            'indemnites_volontariat',
-            'revenus_stage_formation_pro',
-            'bourse_recherche',
-            'hsup',
-            'etr',
-            'rpns_auto_entrepreneur_benefice',
-            'rsa_indemnites_journalieres_activite',
-            ]
-
-        possede_ressource_substitution = individu('rsa_has_ressources_substitution', period)
-
-        # Les revenus pros interrompus au mois M sont neutralisés s'il n'y a pas de revenus de substitution.
-        revenus_moyennes = sum(
-            individu(type_revenu, last_3_months, options = [ADD]) * not_(
-                (individu(type_revenu, period) == 0)
-                * (individu(type_revenu, period.last_month) > 0)
-                * not_(possede_ressource_substitution)
-                )
-            for type_revenu in types_revenus_activite
-            ) / 3
-
-        revenus_tns_annualises = 0
-        if period.start.date >= date(2017, 1, 1):
-            revenus_tns_annualises = individu('ppa_rsa_derniers_revenus_tns_annuels_connus', period.this_year)
-
-        return revenus_moyennes + revenus_tns_annualises
+        return rsa_revenu_activite_individu_base_formula(individu= individu, period=period, three_months_of_reference=last_3_months)
 
 
 class rsa_montant(Variable):
@@ -1043,3 +963,133 @@ class rsa_socle_majore(Variable):
         socle = rsa.rsa_m.montant_de_base_du_rsa
 
         return eligib * socle * taux
+
+
+def last_3_months_offset_minus_1(period) -> Period:
+    return period.last_month.last_3_months
+
+
+def rsa_revenu_activite_individu_base_formula(individu, period, three_months_of_reference):
+    revenus_moyennes = calcul_revenu_moyenne(individu= individu, period=period, three_months_of_reference=three_months_of_reference)
+    revenus_tns_annualises = calcul_revenu_tns_annualises(individu=individu, period=period)
+
+    return revenus_moyennes + revenus_tns_annualises
+
+
+def rsa_base_ressources_individu_base_formula(individu, period, three_months_of_reference, parameters):
+    revenus_pro = calcul_revenu_pro(individu=individu, period= period, three_months_of_reference= three_months_of_reference)
+    revenus_non_pros = calcul_revenu_non_pro(individu=individu, period= period, three_months_of_reference= three_months_of_reference, parameters= parameters)
+    revenus_foyer_fiscal_projetes = calcul_foyer_fiscal_projetes(individu=individu, three_months_of_reference= three_months_of_reference)
+
+    return (revenus_pro + revenus_non_pros + revenus_foyer_fiscal_projetes) / 3
+
+
+def calcul_revenu_pro(individu, period, three_months_of_reference):
+    # Revenus professionels
+    types_revenus_pros = [
+        'chomage_net',
+        'retraite_nette',
+        ]
+
+    possede_ressources_substitution = individu('rsa_has_ressources_substitution', period)
+
+    # Les revenus pros interrompus au mois M sont neutralisés s'il n'y a pas de revenus de substitution.
+    revenus_pro = sum(
+        individu(type_revenu, three_months_of_reference, options = [ADD]) * not_(
+            (individu(type_revenu, period) == 0)
+            * (individu(type_revenu, period.last_month) > 0)
+            * not_(possede_ressources_substitution)
+            )
+        for type_revenu in types_revenus_pros
+        )
+
+    return revenus_pro
+
+
+def calcul_revenu_non_pro(individu, period, three_months_of_reference, parameters):
+    types_revenus_non_pros = [
+        'allocation_securisation_professionnelle',
+        'dedommagement_victime_amiante',
+        'gains_exceptionnels',
+        'pensions_alimentaires_percues',
+        'pensions_invalidite',
+        'prestation_compensatoire',
+        'prime_forfaitaire_mensuelle_reprise_activite',
+        'rsa_base_ressources_patrimoine_individu',
+        'rsa_indemnites_journalieres_hors_activite',
+        ]
+
+    # Les revenus non-pro interrompus au mois M sont neutralisés dans la limite d'un montant forfaitaire,
+    # sans condition de revenu de substitution.
+    montant_de_base_du_rsa = parameters(period).prestations_sociales.solidarite_insertion.minima_sociaux.rsa.rsa_m.montant_de_base_du_rsa
+    montant_forfaitaire_neutralisation = 3 * montant_de_base_du_rsa
+    revenus_non_pros = sum(
+        max_(
+            0,
+            individu(type_revenu, three_months_of_reference, options = [ADD])
+            - (
+                montant_forfaitaire_neutralisation
+                * (individu(type_revenu, period) == 0)
+                * (individu(type_revenu, period.last_month) > 0)
+                )
+            )
+        for type_revenu in types_revenus_non_pros
+        )
+
+    return revenus_non_pros
+
+
+def calcul_foyer_fiscal_projetes(individu, three_months_of_reference):
+    rentes_viageres = individu.foyer_fiscal('rente_viagere_titre_onereux', three_months_of_reference, options = [ADD])
+    revenus_foyer_fiscal_projetes = rentes_viageres * individu.has_role(FoyerFiscal.DECLARANT_PRINCIPAL)
+    return revenus_foyer_fiscal_projetes
+
+
+def calcul_revenu_moyenne(individu, period, three_months_of_reference):
+    # Note Auto-entrepreneurs:
+    # D'après les caisses, le revenu pris en compte pour les AE pour le RSA ne prend en compte que
+    # l'abattement standard sur le CA, mais pas les cotisations pour charges sociales.
+
+    types_revenus_activite = [
+        'salaire_net',
+        'indemnites_chomage_partiel',
+        'remuneration_apprenti',
+        'indemnites_volontariat',
+        'revenus_stage_formation_pro',
+        'bourse_recherche',
+        'hsup',
+        'etr',
+        'rpns_auto_entrepreneur_benefice',
+        'rsa_indemnites_journalieres_activite',
+        ]
+
+    possede_ressource_substitution = individu('rsa_has_ressources_substitution', period)
+
+    # Les revenus pros interrompus au mois M sont neutralisés s'il n'y a pas de revenus de substitution.
+    revenus_moyennes = sum(
+        individu(type_revenu, three_months_of_reference, options = [ADD]) * not_(
+            (individu(type_revenu, period) == 0)
+            * (individu(type_revenu, period.last_month) > 0)
+            * not_(possede_ressource_substitution)
+            )
+        for type_revenu in types_revenus_activite
+        ) / 3
+
+    return revenus_moyennes
+
+
+def calcul_revenu_tns_annualises(individu, period):
+    revenus_tns_annualises = 0
+    if period.start.date >= date(2017, 1, 1):
+        revenus_tns_annualises = individu('ppa_rsa_derniers_revenus_tns_annuels_connus', period.this_year)
+    return revenus_tns_annualises
+
+
+def calcul_minima_sociaux(famille, period, three_months_of_reference):
+    aspa = famille('aspa', period)
+
+    ass_i = famille.members('ass', three_months_of_reference, options = [ADD])
+    aah_i = famille.members('aah', three_months_of_reference, options = [ADD])
+    asi_i = famille.members('asi', three_months_of_reference, options = [ADD])
+    caah_i = famille.members('caah', three_months_of_reference, options = [ADD])
+    return aspa + famille.sum(ass_i + aah_i + asi_i + caah_i) / 3