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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenFisca-France
-Version: 169.1.0
+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

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

@@ -116,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
@@ -4017,8 +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
-OpenFisca_France-169.1.0.dist-info/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
-OpenFisca_France-169.1.0.dist-info/METADATA,sha256=HObKU0MgUiU5Gqg2lVkg82b-gUqsOaCxj2fH1S0NwMU,20862
-OpenFisca_France-169.1.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-OpenFisca_France-169.1.0.dist-info/top_level.txt,sha256=1LbD6QJWehKGIcjtaJ45tbQOSDiFEXOlIdgWRI_jaHU,17
-OpenFisca_France-169.1.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/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