OpenFisca-France 149.4.1__py3-none-any.whl → 149.4.3__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of OpenFisca-France might be problematic. Click here for more details.
- {OpenFisca_France-149.4.1.data → OpenFisca_France-149.4.3.data}/data/share/openfisca/openfisca-france/CHANGELOG.md +22 -0
- {OpenFisca_France-149.4.1.dist-info → OpenFisca_France-149.4.3.dist-info}/METADATA +1 -1
- {OpenFisca_France-149.4.1.dist-info → OpenFisca_France-149.4.3.dist-info}/RECORD +9 -9
- openfisca_france/model/prestations/minima_sociaux/aah.py +12 -9
- openfisca_france/parameters/prestations_sociales/aides_jeunes/sante_psy/etudiant/seances_max.yaml +7 -1
- {OpenFisca_France-149.4.1.data → OpenFisca_France-149.4.3.data}/data/share/openfisca/openfisca-france/README.md +0 -0
- {OpenFisca_France-149.4.1.dist-info → OpenFisca_France-149.4.3.dist-info}/LICENSE.AGPL.txt +0 -0
- {OpenFisca_France-149.4.1.dist-info → OpenFisca_France-149.4.3.dist-info}/WHEEL +0 -0
- {OpenFisca_France-149.4.1.dist-info → OpenFisca_France-149.4.3.dist-info}/top_level.txt +0 -0
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
### 149.4.3 [#2146](https://github.com/openfisca/openfisca-france/pull/2146)
|
|
4
|
+
|
|
5
|
+
* Changement mineur
|
|
6
|
+
* Périodes concernées : à partir du 06/01/2023.
|
|
7
|
+
* Zones impactées :
|
|
8
|
+
- `openfisca_france/parameters/prestations_sociales/aides_jeunes/sante_psy/etudiant/seances_max.yaml`
|
|
9
|
+
* Détails :
|
|
10
|
+
- Le dispositif santé psy étudiants passe de 6 à 8 séances.
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### 149.4.2 [#2128](https://github.com/openfisca/openfisca-france/pull/2128)
|
|
14
|
+
|
|
15
|
+
* Correction d'une erreur de calcul
|
|
16
|
+
* Périodes concernées : toutes.
|
|
17
|
+
* Zones impactées :
|
|
18
|
+
- `openfisca_france/model/prestations/minima_sociaux/aah.py`
|
|
19
|
+
- `tests/formulas/aah/aah.yaml`
|
|
20
|
+
* Détails :
|
|
21
|
+
- Correction du calcul de `base_ressources_aah` : pensions alimentaires versées soustraites au lieu d'être ajoutées
|
|
22
|
+
- Lorsque que quelqu'un paie une pension alimentaire elle est considérée comme une ressource entrante
|
|
23
|
+
|
|
24
|
+
|
|
3
25
|
### 149.4.1 [#2126](https://github.com/openfisca/openfisca-france/pull/2126)
|
|
4
26
|
|
|
5
27
|
* Changement mineur.
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
OpenFisca_France-149.4.
|
|
2
|
-
OpenFisca_France-149.4.
|
|
1
|
+
OpenFisca_France-149.4.3.data/data/share/openfisca/openfisca-france/CHANGELOG.md,sha256=ylfvqKklDsQWE0DxUi_w18f58tOlpH9ktthRdk5qwBU,381692
|
|
2
|
+
OpenFisca_France-149.4.3.data/data/share/openfisca/openfisca-france/README.md,sha256=1Axy_3j5vJp6nOM5N6mKYkpYlTqmw23LDDajru9j54U,18642
|
|
3
3
|
openfisca_france/__init__.py,sha256=MHLZ0V8uQHi4lkZ5bPAoLjsWTJe-wJgLfPxFvbCCxHc,126
|
|
4
4
|
openfisca_france/entities.py,sha256=nGl52ncj9wZzFwASKZk4_OHzhqOUuXGBxNmIiwxZU-c,2576
|
|
5
5
|
openfisca_france/france_taxbenefitsystem.py,sha256=UHVqvkqqYk-9RanSPWlVy3uieG77GCSrWCOqVpeN30I,1687
|
|
@@ -104,7 +104,7 @@ openfisca_france/model/prestations/jeunes/garantie_jeunes.py,sha256=q89lld7zieDm
|
|
|
104
104
|
openfisca_france/model/prestations/jeunes/garantie_pret_etudiant.py,sha256=puWpDkfkfOAnziM2h8gKUGpha-zv4L9DUcYn9EsbQnE,2024
|
|
105
105
|
openfisca_france/model/prestations/jeunes/mobili_jeune.py,sha256=1MDvLFVVWfQEG0qdUJMqh1nPqh47SN0e14afiVkV8TM,5940
|
|
106
106
|
openfisca_france/model/prestations/minima_sociaux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
107
|
-
openfisca_france/model/prestations/minima_sociaux/aah.py,sha256=
|
|
107
|
+
openfisca_france/model/prestations/minima_sociaux/aah.py,sha256=uLA0vP1aWk88YgeNufoxMxu0iy5YsoFKKwv68KsvMeY,41025
|
|
108
108
|
openfisca_france/model/prestations/minima_sociaux/ada.py,sha256=IcJU3BUEsEk59K-W55CyNyafmy6SMv2jpB8eHob7ceE,1426
|
|
109
109
|
openfisca_france/model/prestations/minima_sociaux/aefa.py,sha256=mXOBJgXTl_iA6aaJw4E9M1Z7j97J2OEQ6rInGSuug5s,3357
|
|
110
110
|
openfisca_france/model/prestations/minima_sociaux/anciens_ms.py,sha256=q7Rb5L-E5ZeSX-tuRTOMHKt0e28b3LOID9rI12LdbnQ,9833
|
|
@@ -2257,7 +2257,7 @@ openfisca_france/parameters/prestations_sociales/aides_jeunes/pass_culture/index
|
|
|
2257
2257
|
openfisca_france/parameters/prestations_sociales/aides_jeunes/pass_culture/montants.yaml,sha256=ZQwaw9AuDTNVYeVRbUIoR6FYWisDtLWysHnC9o9VOi0,1039
|
|
2258
2258
|
openfisca_france/parameters/prestations_sociales/aides_jeunes/sante_psy/index.yaml,sha256=evzJRdavXyCTqs8iQ7VAwPYDa1cup0pXdT0AZRO6x3U,114
|
|
2259
2259
|
openfisca_france/parameters/prestations_sociales/aides_jeunes/sante_psy/etudiant/index.yaml,sha256=pKKNCn6zBVcwUCbRCxvDxowXe4BCOLKPZaj4jFA-luI,117
|
|
2260
|
-
openfisca_france/parameters/prestations_sociales/aides_jeunes/sante_psy/etudiant/seances_max.yaml,sha256=
|
|
2260
|
+
openfisca_france/parameters/prestations_sociales/aides_jeunes/sante_psy/etudiant/seances_max.yaml,sha256=EDyKuwxf_k5qnA0wADtH7Z-S1IZjl56Dp081t9QEVDQ,548
|
|
2261
2261
|
openfisca_france/parameters/prestations_sociales/aides_logement/index.yaml,sha256=PAkRZRP6dl8drEfpkr9KC0Uq7CwXiOGhloOkv7TgYPc,230
|
|
2262
2262
|
openfisca_france/parameters/prestations_sociales/aides_logement/action_logement/index.yaml,sha256=x7xtrF1cbZtkeUml5gKoAVIgstGjoxezE6uMsno9Rjg,107
|
|
2263
2263
|
openfisca_france/parameters/prestations_sociales/aides_logement/action_logement/locapass/age_max.yaml,sha256=QCKCBC1-vYFQ2Dvg74OA6KergKpr347Uu0H_dXI2pwc,502
|
|
@@ -4111,8 +4111,8 @@ tests/reforms/test_plf2015.py,sha256=AXsENqhs1Vz0jZlxVe7E-LQp4ero9MiVSrQib7cuSR8
|
|
|
4111
4111
|
tests/reforms/test_plf2016_ayrault_muet.py,sha256=yvziiBFaPWbmqZbr0eNzI2xv-98FmZMelxteSOFb_Tk,1066
|
|
4112
4112
|
tests/reforms/test_plfr2014.py,sha256=x07iKrQ9zeWwF5yrLHeO7PhPr8ESbFTdiYewYsfLG2M,1033
|
|
4113
4113
|
tests/reforms/test_trannoy_wasmer.py,sha256=oBpqqCRhaUTLLxiL3JN8EjWwWDsM2ALy6nENf7-Jg3A,1455
|
|
4114
|
-
OpenFisca_France-149.4.
|
|
4115
|
-
OpenFisca_France-149.4.
|
|
4116
|
-
OpenFisca_France-149.4.
|
|
4117
|
-
OpenFisca_France-149.4.
|
|
4118
|
-
OpenFisca_France-149.4.
|
|
4114
|
+
OpenFisca_France-149.4.3.dist-info/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
|
|
4115
|
+
OpenFisca_France-149.4.3.dist-info/METADATA,sha256=I8uem-1YMlNEHyezSPCP0SWQeB9ohVnHXt44skFePbs,20549
|
|
4116
|
+
OpenFisca_France-149.4.3.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
|
|
4117
|
+
OpenFisca_France-149.4.3.dist-info/top_level.txt,sha256=hmd7WhmLN_CyB52sP702pN9WlJqO9YMVuzeBRNp3hfs,23
|
|
4118
|
+
OpenFisca_France-149.4.3.dist-info/RECORD,,
|
|
@@ -2,7 +2,7 @@ from openfisca_core.periods import Period
|
|
|
2
2
|
|
|
3
3
|
from openfisca_france.model.base import *
|
|
4
4
|
|
|
5
|
-
from numpy import datetime64
|
|
5
|
+
from numpy import datetime64, absolute as abs_
|
|
6
6
|
|
|
7
7
|
# Références juridiques - Code de la sécurité sociale
|
|
8
8
|
#
|
|
@@ -111,10 +111,10 @@ class aah_base_ressources(Variable):
|
|
|
111
111
|
base_ressource_activite = individu('aah_base_ressources_activite_eval_trimestrielle', period) - individu('aah_base_ressources_activite_milieu_protege', three_previous_months, options = [ADD])
|
|
112
112
|
base_ressource_hors_activite = individu('aah_base_ressources_hors_activite_eval_trimestrielle', period) + individu('aah_base_ressources_activite_milieu_protege', three_previous_months, options = [ADD])
|
|
113
113
|
|
|
114
|
-
base_ressource_demandeur = assiette_revenu_activite_demandeur(base_ressource_activite) + base_ressource_hors_activite
|
|
114
|
+
base_ressource_demandeur = max_(0, assiette_revenu_activite_demandeur(base_ressource_activite) + base_ressource_hors_activite)
|
|
115
115
|
|
|
116
|
-
base_ressource_demandeur_conjoint = individu.famille.demandeur('aah_base_ressources_activite_eval_trimestrielle', period) + individu.famille.demandeur('aah_base_ressources_hors_activite_eval_trimestrielle', period)
|
|
117
|
-
base_ressource_conjoint_conjoint = individu.famille.conjoint('aah_base_ressources_activite_eval_trimestrielle', period) + individu.famille.conjoint('aah_base_ressources_hors_activite_eval_trimestrielle', period)
|
|
116
|
+
base_ressource_demandeur_conjoint = max_(0, individu.famille.demandeur('aah_base_ressources_activite_eval_trimestrielle', period) + individu.famille.demandeur('aah_base_ressources_hors_activite_eval_trimestrielle', period))
|
|
117
|
+
base_ressource_conjoint_conjoint = max_(0, individu.famille.conjoint('aah_base_ressources_activite_eval_trimestrielle', period) + individu.famille.conjoint('aah_base_ressources_hors_activite_eval_trimestrielle', period))
|
|
118
118
|
base_ressource_conjoint = base_ressource_conjoint_conjoint * individu.has_role(Famille.DEMANDEUR) + base_ressource_demandeur_conjoint * individu.has_role(Famille.CONJOINT)
|
|
119
119
|
|
|
120
120
|
return base_ressource_demandeur + assiette_conjoint(base_ressource_conjoint)
|
|
@@ -157,10 +157,10 @@ class aah_base_ressources(Variable):
|
|
|
157
157
|
base_ressource_activite = individu('aah_base_ressources_activite_eval_trimestrielle', period) - individu('aah_base_ressources_activite_milieu_protege', three_previous_months, options = [ADD])
|
|
158
158
|
base_ressource_hors_activite = individu('aah_base_ressources_hors_activite_eval_trimestrielle', period) + individu('aah_base_ressources_activite_milieu_protege', three_previous_months, options = [ADD])
|
|
159
159
|
|
|
160
|
-
base_ressource_demandeur = assiette_revenu_activite_demandeur(base_ressource_activite) + base_ressource_hors_activite
|
|
160
|
+
base_ressource_demandeur = max_(0, assiette_revenu_activite_demandeur(base_ressource_activite) + base_ressource_hors_activite)
|
|
161
161
|
|
|
162
162
|
base_ressource_demandeur_conjoint = individu.famille.demandeur('aah_base_ressources_activite_eval_trimestrielle', period) + individu.famille.demandeur('aah_base_ressources_hors_activite_eval_trimestrielle', period)
|
|
163
|
-
base_ressource_conjoint_conjoint = individu.famille.conjoint('aah_base_ressources_activite_eval_trimestrielle', period) + individu.famille.conjoint('aah_base_ressources_hors_activite_eval_trimestrielle', period)
|
|
163
|
+
base_ressource_conjoint_conjoint = max_(0, individu.famille.conjoint('aah_base_ressources_activite_eval_trimestrielle', period) + individu.famille.conjoint('aah_base_ressources_hors_activite_eval_trimestrielle', period))
|
|
164
164
|
base_ressource_conjoint = base_ressource_conjoint_conjoint * individu.has_role(Famille.DEMANDEUR) + base_ressource_demandeur_conjoint * individu.has_role(Famille.CONJOINT)
|
|
165
165
|
|
|
166
166
|
return base_ressource_demandeur + assiette_conjoint(base_ressource_conjoint)
|
|
@@ -198,7 +198,7 @@ class aah_base_ressources(Variable):
|
|
|
198
198
|
base_ressource_activite = individu('aah_base_ressources_activite_eval_trimestrielle', period) - individu('aah_base_ressources_activite_milieu_protege', three_previous_months, options = [ADD])
|
|
199
199
|
base_ressource_hors_activite = individu('aah_base_ressources_hors_activite_eval_trimestrielle', period) + individu('aah_base_ressources_activite_milieu_protege', three_previous_months, options = [ADD])
|
|
200
200
|
|
|
201
|
-
base_ressource_demandeur = assiette_revenu_activite_demandeur(base_ressource_activite) + base_ressource_hors_activite
|
|
201
|
+
base_ressource_demandeur = max_(0, assiette_revenu_activite_demandeur(base_ressource_activite) + base_ressource_hors_activite)
|
|
202
202
|
|
|
203
203
|
return base_ressource_demandeur
|
|
204
204
|
|
|
@@ -309,7 +309,6 @@ class aah_base_ressources_hors_activite_eval_trimestrielle(Variable):
|
|
|
309
309
|
'bourse_recherche',
|
|
310
310
|
'gains_exceptionnels',
|
|
311
311
|
'pensions_alimentaires_percues',
|
|
312
|
-
'pensions_alimentaires_versees_individu',
|
|
313
312
|
'pensions_invalidite',
|
|
314
313
|
'prestation_compensatoire',
|
|
315
314
|
'retraite_nette',
|
|
@@ -319,8 +318,12 @@ class aah_base_ressources_hors_activite_eval_trimestrielle(Variable):
|
|
|
319
318
|
ressources = sum(
|
|
320
319
|
[individu(ressource, three_previous_months, options = [ADD]) for ressource in ressources_a_inclure]
|
|
321
320
|
)
|
|
321
|
+
# On récupère le montant absolu des pensions alimentaires versées au cas où la valeur reçue est négative
|
|
322
|
+
pensions_alimentaires_versees = abs_(individu(
|
|
323
|
+
'pensions_alimentaires_versees_individu', three_previous_months, options = [ADD]))
|
|
322
324
|
|
|
323
|
-
|
|
325
|
+
# On soustrait le montant des pensions alimentaires versées à la base des ressources
|
|
326
|
+
return (ressources - pensions_alimentaires_versees) * 4
|
|
324
327
|
|
|
325
328
|
|
|
326
329
|
class aah_base_ressources_activite_eval_annuelle(Variable):
|
openfisca_france/parameters/prestations_sociales/aides_jeunes/sante_psy/etudiant/seances_max.yaml
CHANGED
|
@@ -2,11 +2,17 @@ description: Nombre maximum de séances prises en charge par le chèque santé p
|
|
|
2
2
|
values:
|
|
3
3
|
2021-03-10:
|
|
4
4
|
value: 6
|
|
5
|
+
2023-01-06:
|
|
6
|
+
value: 8
|
|
5
7
|
metadata:
|
|
6
8
|
short_label: Nb max de séances
|
|
7
9
|
reference:
|
|
8
10
|
2021-03-10:
|
|
9
11
|
href: https://www.service-public.fr/particuliers/actualites/A14726
|
|
10
|
-
|
|
12
|
+
2023-01-06:
|
|
13
|
+
href: https://www.service-public.fr/particuliers/actualites/A14726
|
|
14
|
+
notes:
|
|
11
15
|
2021-03-10:
|
|
12
16
|
- title: 2 cycles de 3 séances au maximum
|
|
17
|
+
2023-01-06:
|
|
18
|
+
- title: 8 séances gratuites de suivi avec un psychologue
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|