OpenFisca-France 169.0.0__py3-none-any.whl → 169.1.1__py3-none-any.whl

{OpenFisca_France-169.0.0.dist-info → OpenFisca_France-169.1.1.dist-info}/METADATA

@@ -1,12 +1,14 @@
 Metadata-Version: 2.1
 Name: OpenFisca-France
-Version: 169.0.0
-Summary: French tax and benefit system for OpenFisca
-Home-page: https://github.com/openfisca/openfisca-france
-Author: OpenFisca Team
-Author-email: contact@openfisca.fr
-License: http://www.fsf.org/licensing/licenses/agpl-3.0.html
-Keywords: benefit france microsimulation social tax
+Version: 169.1.1
+Summary: OpenFisca Rules as Code model for France.
+Author-email: OpenFisca Team <contact@openfisca.fr>
+Project-URL: Homepage, https://github.com/openfisca/openfisca-france
+Project-URL: Repository, https://github.com/openfisca/openfisca-france
+Project-URL: Documentation, https://openfisca.org/doc
+Project-URL: Issues, https://github.com/openfisca/openfisca-france/issues
+Project-URL: Changelog, https://github.com/openfisca/openfisca-france/blob/main/CHANGELOG.md
+Keywords: microsimulation,tax,benefit,rac,rules-as-code,france
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Operating System :: POSIX
@@ -15,21 +17,25 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.AGPL.txt
 Requires-Dist: numpy <2,>=1.24.3
-Requires-Dist: OpenFisca-Core <44,>=43
+Requires-Dist: openfisca-core[web-api] <44,>=43
 Provides-Extra: casd-dev
 Requires-Dist: autopep8 <3.0,>=2.0.2 ; extra == 'casd-dev'
+Requires-Dist: pytest ; extra == 'casd-dev'
 Requires-Dist: requests <3.0,>=2.28.2 ; extra == 'casd-dev'
 Requires-Dist: scipy <2.0,>=1.10.1 ; extra == 'casd-dev'
 Provides-Extra: de_net_a_brut
 Requires-Dist: scipy <2.0,>=1.10.1 ; extra == 'de_net_a_brut'
 Provides-Extra: dev
 Requires-Dist: autopep8 <3.0,>=2.0.2 ; extra == 'dev'
+Requires-Dist: Flake8-pyproject <2.0.0,>=1.2.3 ; extra == 'dev'
 Requires-Dist: flake8 <7.0.0,>=6.0.0 ; extra == 'dev'
 Requires-Dist: flake8-print <6.0.0,>=5.0.0 ; extra == 'dev'
 Requires-Dist: flake8-quotes >=3.3.2 ; extra == 'dev'
+Requires-Dist: pytest ; extra == 'dev'
 Requires-Dist: scipy <2.0,>=1.10.1 ; extra == 'dev'
 Requires-Dist: requests <3.0,>=2.28.2 ; extra == 'dev'
 Requires-Dist: yamllint <2.0,>=1.30.0 ; extra == 'dev'

{OpenFisca_France-169.0.0.dist-info → OpenFisca_France-169.1.1.dist-info}/RECORD

@@ -1,5 +1,3 @@
-OpenFisca_France-169.0.0.data/data/share/openfisca/openfisca-france/CHANGELOG.md,sha256=ICA8T99ga-_wJ88vg6HzniOvH_DyCVUznqvMouUFE68,456903
-OpenFisca_France-169.0.0.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
@@ -16,6 +14,7 @@ openfisca_france/assets/taxe_habitation/parametres_th_2019.csv,sha256=Ha8ysg2bbE
 openfisca_france/assets/taxe_habitation/parametres_th_2020.csv,sha256=yAiuCwx7iARH-KgcPMIYQm_LxPiF63tZB7F8xwMbR8Y,1933804
 openfisca_france/assets/taxe_habitation/parametres_th_2021.csv,sha256=g4bogeIyCRhcsFcj7Pmyr6VDB7LAX0KUkFrrq7Yek_o,1835924
 openfisca_france/assets/taxe_habitation/parametres_th_2022.csv,sha256=t9LUWTzLANhMNOKANwiUmAJ6LeBSdW9IWvyT07D3-xw,1934360
+openfisca_france/assets/taxe_habitation/source/do_REI_2017-2018_to_csv.do,sha256=A9dbu4uPuZDPxy40DKZmiHjre-s2f65qBM0mSvZOyCg,8304
 openfisca_france/assets/versement_transport/taux.json,sha256=waklTUpATx-gWWusFekcOvE7akWKoHH3Fq3d11Rzx8U,3445711
 openfisca_france/conf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openfisca_france/conf/cache_blacklist.py,sha256=QfCGXsPfDCw8r0wC0p0Lsk587MsryxaG034qHSeVuPo,2769
@@ -117,7 +116,7 @@ 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=_mfMFmqXTzJFL28StwRPPAqhJghG3LvVrFUOiUOBMJ4,25384
+openfisca_france/model/prestations/minima_sociaux/ppa.py,sha256=NFK5RuXb4OO34MCAPCdPm_z1tNYkV9JZ8IAA-UMFgH0,25511
 openfisca_france/model/prestations/minima_sociaux/rsa.py,sha256=Zm4PtXMrJKzoT_lLctdL049Grv4hQd0PR07Q7ubZeRk,48162
 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
@@ -4018,19 +4017,8 @@ openfisca_france/scripts/performance/measure_spiral_performances.py,sha256=cQIxE
 openfisca_france/scripts/performance/measure_tests_performance.py,sha256=HYgSJy-OMZay2AZt6ztntgdUbW_RL2xMr-iHcK-zoVY,1869
 openfisca_france/situation_examples/__init__.py,sha256=BTRmrqk9lsjfhtPXsYcsWqXFEYyFpgLcxNs6oJsy8zk,262
 openfisca_france/situation_examples/couple.json,sha256=Ot1x4wl3IS-2-10X3V7ZUokkOMXi96s-xK7A0gNvRF4,862
-tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/cache.py,sha256=fnwYnjaPGialgNsMaprFAwa3nD0rs_AHLbMYC_5ebGg,99
-tests/test_basics.py,sha256=20Kfl-de6ZvX71bCGaJ0giZ8GQ_UXGTz_clgg3l7fXE,1396
-tests/test_coefficient.py,sha256=iEC_nfQJ__qBYOjgpG5amyC1lQgv1EOvzfjHc61uDdM,1998
-tests/test_entities.py,sha256=GgsZL-uWi42fxVrvCyU0w8FGw_iFN1ElUUiStFq5_nc,5189
-tests/test_metadata.py,sha256=PH_KMb7IeJWw5pFNaq4vQknVRj6fhaW1GxppYQGwC5k,257
-tests/test_nb_enfants.py,sha256=sfiTyx66xW85SkXJEOWFAN-ptBZToNry2xdNiBSEGuw,890
-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-169.0.0.dist-info/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
-OpenFisca_France-169.0.0.dist-info/METADATA,sha256=mdy4_9h7ri7xoBD_6WzoQYrPrhlQDynFI7YW434Kgsw,20437
-OpenFisca_France-169.0.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-OpenFisca_France-169.0.0.dist-info/top_level.txt,sha256=hmd7WhmLN_CyB52sP702pN9WlJqO9YMVuzeBRNp3hfs,23
-OpenFisca_France-169.0.0.dist-info/RECORD,,
+OpenFisca_France-169.1.1.dist-info/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
+OpenFisca_France-169.1.1.dist-info/METADATA,sha256=k-Fwo4xw8iDUZmAY-EsirDREQ7RXRT1NKw3ezKdWIHs,20862
+OpenFisca_France-169.1.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+OpenFisca_France-169.1.1.dist-info/top_level.txt,sha256=1LbD6QJWehKGIcjtaJ45tbQOSDiFEXOlIdgWRI_jaHU,17
+OpenFisca_France-169.1.1.dist-info/RECORD,,

{OpenFisca_France-169.0.0.dist-info → OpenFisca_France-169.1.1.dist-info}/top_level.txt

@@ -1,2 +1 @@
 openfisca_france
-tests

openfisca_france/assets/taxe_habitation/source/do_REI_2017-2018_to_csv.do

@@ -0,0 +1,175 @@
+/***************************************************************************************/
+/*** Mise en forme des fichiers REI 2017 à 2022 pour OpenFisca
+     Nécessite Stata version 14                        *********************************/
+/***************************************************************************************/
+
+clear
+set more off
+cap log close
+
+**** Chemin des REI en local. Les fichiers REI en .xlsx sont accessibles en ligne sur https://www.data.gouv.fr/fr/datasets/impots-locaux-fichier-de-recensement-des-elements-dimposition-a-la-fiscalite-directe-locale-rei-3/
+global input_2017 = ""
+global input_2018 = ""
+global input_2019 = ""
+global input_2020 = ""
+global input_2021 = ""
+global input_2022 = ""
+
+**** Chemin d'export du fichier csv
+global export_2017 = ""
+global export_2018 = ""
+global export_2019 = ""
+global export_2020 = ""
+global export_2021 = ""
+global export_2022 = ""
+
+*2017-2018
+forval i=2017/2018 {
+	set excelxlsxlargefile on
+	import excel using "${input_`i'}.xlsx", firstrow clear
+	keep DEP COM SIREPCI Q03 LIBCOM H12 H32 J21 J23 J31* J33* J41* J43* J51* J53* J61* J63*
+	compress
+
+	foreach var of varlist H* J* {
+		replace `var' = 0 if `var'==.
+	}
+	gen code_insee_commune = trim(DEP) + trim(COM)
+
+	gen taux_com   = H12/100
+	gen taux_epci  = H32/100
+
+	gen valeur_locative_moyenne_com  = J21
+	gen valeur_locative_moyenne_epci = J23
+
+	* Pour certaines intercom, il n'y a pas de quotité ajustée mais seulement une quotité simple. Surement due aux interco créées après 2010 (qui est l'année du transfert de la TH départementale justifiant cet ajustement). Donc, si la valeur ajustée est nulle, on prend la quotité simple
+	gen abt_general_base_com       = cond(J51A~=0,J51A,J51)
+	gen abt_general_base_epci      = cond(J53A~=0,J53A,J53)
+	gen abt_pac_1_2_com            = cond(J31A~=0,J31A,J31)
+	gen abt_pac_1_2_epci           = cond(J33A~=0,J33A,J33)
+	gen abt_pac_3pl_com            = cond(J41A~=0,J41A,J41)
+	gen abt_pac_3pl_epci           = cond(J43A~=0,J43A,J43)
+	gen abt_condition_modeste_com  = cond(J61A~=0,J61A,J61)
+	gen abt_condition_modeste_epci = cond(J63A~=0,J63A,J63)
+
+	keep code_insee_commune taux_* valeur_locative_moyenne_* abt_*
+	foreach var of varlist  taux_* valeur_locative_moyenne_* abt_* {
+		replace `var' = 0 if `var'==.
+	}
+
+	sort     code_insee_commune
+	outsheet code_insee_commune taux_* valeur_locative_moyenne_* abt_* using "${export_`i'}.csv", comma replace
+}
+*2019-2020
+forval i=2019/2020 {
+	set excelxlsxlargefile on
+	import excel using "${input_`i'}.xlsx", firstrow clear
+	keep DEPARTEMENT COMMUNE NUMEROSIRENDELEPCI THCOMMUNETAUXNET THINTERCOMMUNALITETAUXAPP THVLMOYENNEUTILISEEPOUR IJ  THQUOTITEDESABATTEMENTSAVA THQUOTITEDESABATTEMENTSAJ IL THQUOTITEDESABATTEMENTSAJU IO IP IQ IR IS IT IU IV IW IX IY IZ
+	
+	compress
+
+	foreach var of varlist THCOMMUNETAUXNET THINTERCOMMUNALITETAUXAPP THQUOTITEDESABATTEMENTSAVA THQUOTITEDESABATTEMENTSAJ IL THQUOTITEDESABATTEMENTSAJU IO IP IQ IR IS IT IU IV IW IX IY IZ {
+		replace `var' = 0 if `var'==.
+	}
+	gen code_insee_commune = trim(DEPARTEMENT) + trim(COMMUNE)
+
+	gen taux_com   = THCOMMUNETAUXNET/100
+	gen taux_epci  = THINTERCOMMUNALITETAUXAPP/100
+
+	
+	gen valeur_locative_moyenne_com  = THVLMOYENNEUTILISEEPOUR
+	gen valeur_locative_moyenne_epci = IJ
+	
+	
+	* Pour certaines intercom, il n'y a pas de quotité ajustée mais seulement une quotité simple. Surement due aux interco créées après 2010 (qui est l'année du transfert de la TH départementale justifiant cet ajustement). Donc, si la valeur ajustée est nulle, on prend la quotité simple
+	gen abt_general_base_com       = cond(IU~=0,IU,IS)
+	gen abt_general_base_epci      = cond(IV~=0,IV,IT)
+	gen abt_pac_1_2_com            = cond(THQUOTITEDESABATTEMENTSAJ~=0,THQUOTITEDESABATTEMENTSAJ,THQUOTITEDESABATTEMENTSAVA)
+	gen abt_pac_1_2_epci           = cond(THQUOTITEDESABATTEMENTSAJU~=0,THQUOTITEDESABATTEMENTSAJU,IL)
+	gen abt_pac_3pl_com            = cond(IQ~=0,IQ,IO)
+	gen abt_pac_3pl_epci           = cond(IR~=0,IR,IP)
+	gen abt_condition_modeste_com  = cond(IY~=0,IY,IW)
+	gen abt_condition_modeste_epci = cond(IZ~=0,IZ,IX)
+
+	keep code_insee_commune taux_* valeur_locative_moyenne_* abt_*
+	foreach var of varlist  taux_* valeur_locative_moyenne_* abt_* {
+		replace `var' = 0 if `var'==.
+	}
+
+	sort     code_insee_commune
+	outsheet code_insee_commune taux_* valeur_locative_moyenne_* abt_* using "${export_`i'}.csv", comma replace
+}
+
+*2021
+set excelxlsxlargefile on
+import excel using "${input_2021}.xlsx", firstrow clear
+keep DEPARTEMENT COMMUNE NUMEROSIRENDELEPCI THCOMMUNETAUXNET THINTERCOMMUNALITETAUXAPP THVLMOYENNEUTILISEEPOUR HV  THQUOTITEDESABATTEMENTSAVA THQUOTITEDESABATTEMENTSAJ IL THQUOTITEDESABATTEMENTSAJU IB IC ID IE IF IG IH II IJ IK IL IM
+
+compress
+
+foreach var of varlist THCOMMUNETAUXNET THINTERCOMMUNALITETAUXAPP THVLMOYENNEUTILISEEPOUR HV THQUOTITEDESABATTEMENTSAVA THQUOTITEDESABATTEMENTSAJ IL THQUOTITEDESABATTEMENTSAJU IB IC ID IE IF IG IH II IJ IK IL IM {
+	replace `var' = 0 if `var'==.
+}
+gen code_insee_commune = trim(DEPARTEMENT) + trim(COMMUNE)
+
+gen taux_com   = THCOMMUNETAUXNET/100
+gen taux_epci  = THINTERCOMMUNALITETAUXAPP/100
+
+
+gen valeur_locative_moyenne_com  = THVLMOYENNEUTILISEEPOUR
+gen valeur_locative_moyenne_epci = HV
+
+* Pour certaines intercom, il n'y a pas de quotité ajustée mais seulement une quotité simple. Surement due aux interco créées après 2010 (qui est l'année du transfert de la TH départementale justifiant cet ajustement). Donc, si la valeur ajustée est nulle, on prend la quotité simple
+gen abt_general_base_com       = cond(IH~=0,IH,IF)
+gen abt_general_base_epci      = cond(II~=0,II,IG)
+gen abt_pac_1_2_com            = cond(THQUOTITEDESABATTEMENTSAJ~=0,THQUOTITEDESABATTEMENTSAJ,THQUOTITEDESABATTEMENTSAVA)
+gen abt_pac_1_2_epci           = cond(THQUOTITEDESABATTEMENTSAJU~=0,THQUOTITEDESABATTEMENTSAJU,IL)
+gen abt_pac_3pl_com            = cond(ID~=0,ID,IB)
+gen abt_pac_3pl_epci           = cond(IE~=0,IE,IC)
+gen abt_condition_modeste_com  = cond(IL~=0,IL,IJ)
+gen abt_condition_modeste_epci = cond(IM~=0,IM,IK)
+
+keep code_insee_commune taux_* valeur_locative_moyenne_* abt_*
+foreach var of varlist  taux_* valeur_locative_moyenne_* abt_* {
+	replace `var' = 0 if `var'==.
+}
+
+sort     code_insee_commune
+outsheet code_insee_commune taux_* valeur_locative_moyenne_* abt_* using "${export_2021}.csv", comma replace
+
+
+*2022
+set excelxlsxlargefile on
+import excel using "${input_2022}.xlsx", firstrow clear
+keep DEPARTEMENT COMMUNE NUMEROSIRENDELEPCI THCOMMUNETAUXNET THINTERCOMMUNALITETAUXAPP THVLMOYENNEUTILISEEPOUR IG  THQUOTITEDESABATTEMENTSAVA THQUOTITEDESABATTEMENTSAJ II THQUOTITEDESABATTEMENTSAJU IL IM IN IO IP IQ IR IS IT IU IV IW
+
+compress
+
+foreach var of varlist THCOMMUNETAUXNET THINTERCOMMUNALITETAUXAPP THVLMOYENNEUTILISEEPOUR IG THQUOTITEDESABATTEMENTSAVA THQUOTITEDESABATTEMENTSAJ II THQUOTITEDESABATTEMENTSAJU IL IM IN IO IP IQ IR IS IT IU IV IW {
+	replace `var' = 0 if `var'==.
+}
+gen code_insee_commune = trim(DEPARTEMENT) + trim(COMMUNE)
+
+gen taux_com   = THCOMMUNETAUXNET/100
+gen taux_epci  = THINTERCOMMUNALITETAUXAPP/100
+
+
+gen valeur_locative_moyenne_com  = THVLMOYENNEUTILISEEPOUR
+gen valeur_locative_moyenne_epci = IG
+
+* Pour certaines intercom, il n'y a pas de quotité ajustée mais seulement une quotité simple. Surement due aux interco créées après 2010 (qui est l'année du transfert de la TH départementale justifiant cet ajustement). Donc, si la valeur ajustée est nulle, on prend la quotité simple
+gen abt_general_base_com       = cond(IR~=0,IR,IP)
+gen abt_general_base_epci      = cond(IS~=0,IS,IQ)
+gen abt_pac_1_2_com            = cond(THQUOTITEDESABATTEMENTSAJ~=0,THQUOTITEDESABATTEMENTSAJ,THQUOTITEDESABATTEMENTSAVA)
+gen abt_pac_1_2_epci           = cond(THQUOTITEDESABATTEMENTSAJU~=0,THQUOTITEDESABATTEMENTSAJU,II)
+gen abt_pac_3pl_com            = cond(IN~=0,IN,IL)
+gen abt_pac_3pl_epci           = cond(IO~=0,IO,IM)
+gen abt_condition_modeste_com  = cond(IV~=0,IV,IT)
+gen abt_condition_modeste_epci = cond(IW~=0,IW,IU)
+
+keep code_insee_commune taux_* valeur_locative_moyenne_* abt_*
+foreach var of varlist  taux_* valeur_locative_moyenne_* abt_* {
+	replace `var' = 0 if `var'==.
+}
+
+sort     code_insee_commune
+outsheet code_insee_commune taux_* valeur_locative_moyenne_* abt_* using "${export_2022}.csv", comma replace

openfisca_france/model/prestations/minima_sociaux/ppa.py

@@ -19,10 +19,10 @@ class ppa_eligibilite(Variable):
         return condition_age
 
 
-class ppa_plancher_revenu_activite_etudiant(Variable):
+class ppa_plancher_revenu_activite_apprenant(Variable):
     value_type = float
     entity = Individu
-    label = "Plancher des revenus d'activité pour être éligible à la PPA en tant qu'étudiant"
+    label = "Plancher des revenus d'activité pour être éligible à la PPA en tant qu'apprenant (étudiant/stagiaire ou apprenti)"
     definition_period = MONTH
     set_input = set_input_divide_by_period
 
@@ -36,7 +36,7 @@ class ppa_plancher_revenu_activite_etudiant(Variable):
             )
 
 
-class ppa_eligibilite_etudiants(Variable):
+class ppa_eligibilite_apprenants(Variable):
     value_type = bool
     entity = Famille
     label = 'Eligibilité à la PPA (condition sur tout le trimestre)'
@@ -52,8 +52,8 @@ class ppa_eligibilite_etudiants(Variable):
     def formula(famille, period, parameters):
         ppa_majoree_eligibilite = famille('rsa_majore_eligibilite', period)
 
-        etudiant_i = famille.members('etudiant', period)
-        plancher_etudiant = famille.members('ppa_plancher_revenu_activite_etudiant', period)
+        apprenant_i = famille.members('etudiant', period) + famille.members('stagiaire', period) + famille.members('apprenti', period)
+        plancher_apprenant = famille.members('ppa_plancher_revenu_activite_apprenant', period)
 
         def condition_ressource(period2, plancher):
             revenu_activite = famille.members('ppa_revenu_activite_individu', period2)
@@ -63,21 +63,21 @@ class ppa_eligibilite_etudiants(Variable):
         m_2 = period.offset(-2, 'month')
         m_3 = period.offset(-3, 'month')
 
-        condition_etudiant_i = (
-            condition_ressource(m_1, plancher_etudiant)
-            * condition_ressource(m_2, plancher_etudiant)
-            * condition_ressource(m_3, plancher_etudiant)
+        condition_apprenant_i = (
+            condition_ressource(m_1, plancher_apprenant)
+            * condition_ressource(m_2, plancher_apprenant)
+            * condition_ressource(m_3, plancher_apprenant)
             )
 
-        condition_non_etudiant_i = (
-            not_(etudiant_i) * (
+        condition_non_apprenant_i = (
+            not_(apprenant_i) * (
                 condition_ressource(m_1, 0)
                 + condition_ressource(m_2, 0)
                 + condition_ressource(m_3, 0)
                 )
             )
 
-        condition_famille = famille.any(condition_non_etudiant_i + condition_etudiant_i, role = Famille.PARENT)
+        condition_famille = famille.any(condition_non_apprenant_i + condition_apprenant_i, role = Famille.PARENT)
         return ppa_majoree_eligibilite + condition_famille
 
 
@@ -585,8 +585,8 @@ 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_eligibilite_apprenants = famille('ppa_eligibilite_apprenants', period)
     ppa = famille('ppa_fictive', three_months_of_reference, options = [ADD]) / 3
-    ppa = ppa * ppa_eligibilite_etudiants * (ppa >= seuil_non_versement)
+    ppa = ppa * ppa_eligibilite_apprenants * (ppa >= seuil_non_versement)
 
     return ppa