OpenFisca-France 169.2.0__py3-none-any.whl → 169.3.0__py3-none-any.whl

{OpenFisca_France-169.2.0.dist-info → OpenFisca_France-169.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenFisca-France
-Version: 169.2.0
+Version: 169.3.0
 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.2.0.dist-info → OpenFisca_France-169.3.0.dist-info}/RECORD

@@ -36,9 +36,9 @@ openfisca_france/model/patrimoine/livret_epargne_populaire.py,sha256=Ty_7mjSA1fL
 openfisca_france/model/prelevements_obligatoires/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openfisca_france/model/prelevements_obligatoires/isf.py,sha256=u0qlU4lDXSYDETupuQT608hmeCimhxqExq4B_y1NLcM,45490
 openfisca_france/model/prelevements_obligatoires/impot_revenu/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openfisca_france/model/prelevements_obligatoires/impot_revenu/charges_deductibles.py,sha256=oDdN2oGhtOVPPaaW8dhROpx538drV4s1E0OwacFL92g,28170
+openfisca_france/model/prelevements_obligatoires/impot_revenu/charges_deductibles.py,sha256=dXVJgd_dlJHxvgF_5JMWp9KBv-ovX4ubo43a32jTYG8,28152
 openfisca_france/model/prelevements_obligatoires/impot_revenu/credits_impot.py,sha256=coih4v62o-P3jkMlvO8I_Kc3Y1w4I0Zt5ajwyHQsP1M,128143
-openfisca_france/model/prelevements_obligatoires/impot_revenu/ir.py,sha256=S6xHGPSF_oRJiidYIHkGK9OJLq2xYWP2ZHt93TSNpIM,179620
+openfisca_france/model/prelevements_obligatoires/impot_revenu/ir.py,sha256=kkLR3SNfbzvHOaOBl-TOlXKAO-9-BkW1nIxxpyzLU8c,179938
 openfisca_france/model/prelevements_obligatoires/impot_revenu/plus_values_immobilieres.py,sha256=5gNB5ntU9I9XVeKhYyq94miM4Uv72HruO1Nu_jIPkn4,4754
 openfisca_france/model/prelevements_obligatoires/impot_revenu/reductions_impot_deplafonnees.py,sha256=xMiVnyqCJP9A8rDYKndS814NIn0jO88quS8i2CYasCU,34693
 openfisca_france/model/prelevements_obligatoires/impot_revenu/reductions_impot_iom.py,sha256=Q8hoXmUfuQLqzWA0S1CIaP3M7fAVcKtBVkoj3xJiae0,139248
@@ -123,13 +123,13 @@ openfisca_france/model/prestations/minima_sociaux/cs/acs.py,sha256=nwihxwsjKAmgP
 openfisca_france/model/prestations/minima_sociaux/cs/cmu.py,sha256=b-voxJzetykcF0WMA_cLebBQRd53Y9Z-xQGOA3jpvPk,11718
 openfisca_france/model/prestations/minima_sociaux/cs/css.py,sha256=aWKN99IF-xWYVyZ-dPuK5g8Ydptxq48ZyTCCEDpvt_0,3399
 openfisca_france/model/prestations/minima_sociaux/cs/eligibilite.py,sha256=3Y4eAlMUk3zPlA6SkBHGfTpPz3UALwk1BXEG3i4IF9o,1612
-openfisca_france/model/prestations/minima_sociaux/cs/ressources.py,sha256=IbxBHslyqPHQRs1cjvQ9ax84QyERgTzKIzrJNt1urm0,7552
+openfisca_france/model/prestations/minima_sociaux/cs/ressources.py,sha256=GXfAuwf9PocX8ITc6_8hpr-gkzk59BcAiWh_W9Sp0-8,11889
 openfisca_france/model/prestations/prestations_familiales/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openfisca_france/model/prestations/prestations_familiales/aeeh.py,sha256=3rJg62yCMOYJ0iaj7tnAHDwXIOMLC3_sU5RT0qaWvqA,5526
 openfisca_france/model/prestations/prestations_familiales/af.py,sha256=HWvFcxV2hETSrrTHLgAYZmNBrO8aN22OJYI4zwj-B1c,18369
 openfisca_france/model/prestations/prestations_familiales/ars.py,sha256=mW3gyOTtC3oWOdZeB23WUHZml0fCyLoIBVRPwX-k33k,5344
 openfisca_france/model/prestations/prestations_familiales/asf.py,sha256=0eZiUM6kUGKFrNB-J-ebVdQEiTfNG3VWSFgdUEOBtxg,3581
-openfisca_france/model/prestations/prestations_familiales/base_ressource.py,sha256=Zck5pySZlGolEb0CzomY_arcLwIrTjVFnpfxhcx6akU,13986
+openfisca_france/model/prestations/prestations_familiales/base_ressource.py,sha256=_dRqoH0LKF7wB1myEj48Xl0lv-sdpLElV26csZB2dvQ,13504
 openfisca_france/model/prestations/prestations_familiales/cf.py,sha256=OXCqnr06n-KV5g-hNwz0DK6Yp0nrz42gbj6kAzWmZkA,13711
 openfisca_france/model/prestations/prestations_familiales/paje.py,sha256=apHH3DnDyVfM5ew5aT3ONW-VVSDZFlwusCHysAlu3-k,48231
 openfisca_france/model/prestations/sante_psy/etudiant.py,sha256=DITgwXu7_g0H8wujgUbZV2D7jmgSXPb3FWTxrgtsPxc,938
@@ -417,7 +417,7 @@ openfisca_france/parameters/impot_revenu/bareme_ir_depuis_1945/bareme_taux_neutr
 openfisca_france/parameters/impot_revenu/calcul_impot_revenu/index.yaml,sha256=yOLvgnNvPs9xddlUogsQ4wP3QuMLIx9zgCNPsSPYqpg,163
 openfisca_france/parameters/impot_revenu/calcul_impot_revenu/bouclier_fiscal/index.yaml,sha256=MNMMuFIIPsYYIVnZyK5hlfcZRSPNzFboFBHOrW6_NQ8,29
 openfisca_france/parameters/impot_revenu/calcul_impot_revenu/bouclier_fiscal/taux.yaml,sha256=MgIqaZ3DD4lLX5oQ6J0D-v118EbFbCf0_Piy35q_EFo,156
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/index.yaml,sha256=CzmV7DpLzINeZ-VMk7UCUYrEPc59WQ1p8hLyVIWjxZs,1746
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/index.yaml,sha256=4493QVE1N0uqFFCehNA_MREZzFMYcEQXBeouvzSXS60,1746
 openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/abat_dom/index.yaml,sha256=V2duQIz2iKrwmpaq3AKtkbRI-xVl2QqyFelQ-HTdr9o,209
 openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/abat_dom/plaf_GuadMarReu.yaml,sha256=4ro7lg73b6LULV-wOR1x9UnCzk431wx7FpMQx2-3_BI,543
 openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/abat_dom/plaf_GuyMay.yaml,sha256=1OiG69dMLL4QvUBZkeak0UTkxNlSoxnNjIdesEpv35w,608
@@ -441,20 +441,22 @@ openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/plafond_ava
 openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/plafond_avantages_procures_par_demi_part/index.yaml,sha256=xugixvDayIZ7lacATJc8SrUyOrK9p3hX2G1lwIndCys,223
 openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/plafond_avantages_procures_par_demi_part/reduc_postplafond.yaml,sha256=AuPPXbwDS1p72bkZFltNvmmC7ISaUgqypQCuMqhepnM,7472
 openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/plafond_avantages_procures_par_demi_part/reduc_postplafond_veuf.yaml,sha256=OxIwolWzZ9aGpRdQhF1-A4xh1j1X6E0fOU-CYTPrPzw,4736
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/cdcd.yaml,sha256=bQ4-8kZkGMmWKFahHekjWCxBSPwVrNsV7a7Lc7edYc4,714
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/conj.yaml,sha256=x-wSqE-ggq6Lw8Qua446YSTAcG7nEbjRjkxxtNEv4pE,627
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/enf1.yaml,sha256=Ace6_UxI8Jjg5ExrahRYrWLyFLjSNrEHgxI1hN3XfpU,420
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/enf2.yaml,sha256=M5cyr-b-eMCkOSHK3LSQ8f7p0I0IuwWayOkwZVh9gQg,428
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/enf3_et_sup.yaml,sha256=BhM6O-jpkPYoqBWDblOElU4W22IRSx966B-rDZxdjt4,657
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/index.yaml,sha256=Xxlki8Zw4tRRibBALPnWFtdzrANHn1Q64oLZmx6gWas,231
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/inv1.yaml,sha256=o3nJshAK7tkSd3akdebUyJAB6xJgOOzSYmG4wbgi9j8,1017
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/inv2.yaml,sha256=3AJ9Ev30i_pGpjzK8Sv0BWvRizrJcWiLsLUyDnpHUUM,600
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/isol.yaml,sha256=MhqWIK9Q25YsabL5yfRkvKto5bFNR0y76kihVs64bfw,540
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/not41.yaml,sha256=k6YnclXcNqnMW0j02YpuYatSHvslbD0p4g8vCiJvcwY,673
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/not42.yaml,sha256=60J1tJ1kz1DCG2b8rnEHZ932i5WBEMNS0HeZun6sG2k,545
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/not6.yaml,sha256=x1FnybaLTvVvt5TXKrEqsX4PwWs9KxO6d8ETPrG_s9g,477
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/veuf.yaml,sha256=3Hjj_eOcvVachX5Sp6mhygZpbTrrviRR25sSLcmbLZI,607
-openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/sans_pers_a_charge/index.yaml,sha256=Y-KiFeAng_lq_DoyH-aEqUKGUQhcTTyvlPcGBvrkldU,97
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/index.yaml,sha256=VaUfdXckBhWOPaze9a2mfdDk4DKrvV64zmSODqBcMTs,305
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/cas_general/conj.yaml,sha256=Hf57zIeWZlOXd1fAja99zruIAOuSr986nF341AfiUmk,631
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/cas_general/enf1.yaml,sha256=nt8dJtQFzqGAZeEG7hS5VhmtA3rc8pix0vtXTu06VfQ,424
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/cas_general/enf2.yaml,sha256=eMhucEA5xqY3uHFmBh1DDH28kE8u8QAQHmtQFuf8Ttc,428
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/cas_general/enf3_et_sup.yaml,sha256=RbYUfohtfOXfEkmtGbQE02ZbO0L4aBPk8iMq2F25L2E,657
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/cas_general/index.yaml,sha256=_Wurq2PkAVIeUfNT3ITCjV8p9U_WqvkjeHhrdG1UZsc,405
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/cas_general/veuf.yaml,sha256=bXmJlyO661X6U98pjjFe_17QgMUCYCNbU0BA4ZxwmDs,607
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/couple_ou_pers_a_charge/cdcd.yaml,sha256=bQ4-8kZkGMmWKFahHekjWCxBSPwVrNsV7a7Lc7edYc4,714
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/couple_ou_pers_a_charge/index.yaml,sha256=HACWyomWk1dbTajKqfB6Jw-MWB14aP5rNcc5P0mz2f8,566
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/couple_ou_pers_a_charge/inv1.yaml,sha256=o3nJshAK7tkSd3akdebUyJAB6xJgOOzSYmG4wbgi9j8,1017
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/couple_ou_pers_a_charge/inv2.yaml,sha256=-1S2Wa0iEbYyKzfq33AVn7UQjAmDVkMvWQ4O0cXXhc0,1055
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/couple_ou_pers_a_charge/isol.yaml,sha256=vQeC3xzKuB4OyC7uAWkBofYQCpcZt8uKzd7e5-oeJ6g,571
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/couple_ou_pers_a_charge/not41.yaml,sha256=-2aPXDJk9HN--fV8zHnhlQ7jCvbxefvHMo0GBTLMEaQ,753
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/couple_ou_pers_a_charge/not42.yaml,sha256=hrbR2K1Njo8hS3UpVLYJehtHlRHDq1Sa282xyhdAO1U,1244
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/couple_ou_pers_a_charge/not6.yaml,sha256=UY_kzejqEHpEG2AIfUnmp3EG6f24ycL0xhXHkPgOaqA,572
+openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/sans_pers_a_charge/index.yaml,sha256=gO4tI0wM3P4_nO4eB07bdyZumJTi9WZuD6XBvishP0E,121
 openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/sans_pers_a_charge/not31a.yaml,sha256=rqM9ZWFqwHYpa5rR0VgEElmj9X9oSqBbuv5ghUptg0M,687
 openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/sans_pers_a_charge/not31b.yaml,sha256=t0CSqM1WE7i0H9pL8yZsq62AwfZnChqRzTQCyrs35_E,667
 openfisca_france/parameters/impot_revenu/calcul_impot_revenu/plaf_qf/quotient_familial/sans_pers_a_charge/not32.yaml,sha256=QqCCl2cq_VWkkE4WqWxYPyS1jkjn7Kn4EDo8SHib7pw,704
@@ -817,17 +819,12 @@ openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_exceptio
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_exceptionnel/en_faveur_personnes_agees_invalides_2/index.yaml,sha256=E6aXUwiRy8LwkBK9YBeQGD-By-wwB81e-zqU7mKUh9g,273
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_exceptionnel/en_faveur_personnes_agees_invalides_2/seuil_1_revenu_net_global.yaml,sha256=Rl5Ypi35H1XVFSjqFrkpcYA3VUod_wJAJfKCmIVwKj0,886
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_exceptionnel/en_faveur_personnes_agees_invalides_2/seuil_2_revenu_net_global.yaml,sha256=wfYW32Mldufnx7Ib81BqzuEUPpburwEGXnLLbF8nh9s,886
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_rni/index.yaml,sha256=bBrpGWS42vBRCokv2gG-K2dNNRDL5U_Xq5qEq5Xsk3A,204
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_rni/enfant_marie/index.yaml,sha256=7IVsRPqyb7ICQy95r8hp0GCkpcWwikVuQguZsWco_tA,277
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_rni/enfant_marie/montant.yaml,sha256=I36ujKUiSvBcs6LUggyPd8q3c8hwLxAbnD31GdMcbXw,7688
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_rni/personne_agee_ou_invalide/index.yaml,sha256=v8XAHz3UQH8cJ_kImn7jM3dPEPV4cZlQowLf-K4mUWc,1216
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_rni/personne_agee_ou_invalide/montant_1.yaml,sha256=2vfRzJnWfZUeWtW21uXaf3d4mnwP7mnBJZnOUdZxB8E,7667
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_rni/personne_agee_ou_invalide/montant_2.yaml,sha256=2TQbB6EMnDAemERulHNiELHvya6SkKjgux-Eq81z6lI,7653
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_rni/personne_agee_ou_invalide/plafond_1.yaml,sha256=MNSvWwp2IpsDVx9czLWTrlRspp0911Bcxg6wV5tu9RQ,8030
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_rni/personne_agee_ou_invalide/plafond_2.yaml,sha256=Fcd_3PCMs2Gq0J_krWLg536jXRIzxsKXeicS7S-hxRs,8032
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/index.yaml,sha256=FLeM_vS-NG0yBnf4hy5e5YRGS4mSWfrTPiXANA_yfjc,735
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/accueil_personne_agee/index.yaml,sha256=yVZPFZvj-JPhQkADCDyVoqb9fn2nj832ZjgIwPsAcuE,148
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/accueil_personne_agee/plafond.yaml,sha256=-SfHK7zdRpRFOWvrIkN1wwNJXbOH2myo4Jrb3EKP0FQ,9919
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_rni/contribuable_age_invalide.yaml,sha256=6gOg0Kb9yeF8aKgrNAfHY-0NuuHf1B_H8CDhvcgNh5M,13559
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_rni/enfant_marie.yaml,sha256=f7j--xdZj6v_f4NerO9Kp9XCLAeno1OEvlpX-00YsUQ,7768
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/abat_rni/index.yaml,sha256=vIjE311DOILPrNQkAVhS04nKKDO-5GPNVUKKe8_twks,241
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/index.yaml,sha256=XVtmmpPsHxT417YUAJUmD93486KqBbRECnmqboMH4Hs,735
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/accueil_personne_agee/index.yaml,sha256=OH--zHl5n21wnNqMoSX2ymL_4lA2uN3F3rX4EY7PioM,221
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/accueil_personne_agee/plafond.yaml,sha256=uPDaxSGyX3EAGog6cYQ7oLRIsIpM34T4Mlh3m9lgJCo,10122
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/acquisition_navire/index.yaml,sha256=06Wck41GEGdMeeU6NoDXObBMEhLol2joeMIf7Xe6W2E,125
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/acquisition_navire/plafond.yaml,sha256=y69IBD01nQbW5X07rdGv4pPU979c96YdCPRqRTEQ6RA,860
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/acquisition_navire/taux.yaml,sha256=KI62T8HmGHx5_CvdKbRAT83A3bxKKVL4KEOX36r68pE,685
@@ -844,9 +841,9 @@ openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deduc
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/investissements_en_actions/supplement_par_enfant.yaml,sha256=Y19V_W85oaxNn98t_VZjp4H6wXIzhzlQofa_Oho-ZXM,700
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/navires_de_commerce/index.yaml,sha256=gJz_jy_H9GwQ0q-THQvj_UDpTfygnHHSDx1lW4d25-g,116
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/navires_de_commerce/plafond.yaml,sha256=ki2ud_zid-n3vcTQwozUjlMy7YKNia-fzxDYNWXwmr4,875
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/pensions_alimentaires/index.yaml,sha256=j5mezo_bYHmC2eexD5L2uS2beIW-AfcfLl1omlfAwPs,429
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/pensions_alimentaires/plafond.yaml,sha256=Cs_6_X7u3KRtRTZ65DPp6R0hemtpLJoEavWOGLu1IH0,11807
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/pensions_alimentaires/taux_jgt_2006.yaml,sha256=a86H8Vt9_aCRGidLESE4RUjoPPW2cYFCbeB7H1TCItw,744
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/pensions_alimentaires/index.yaml,sha256=zbZ5Ngq7-g89ITNhB6_8KLqeo2GCYt6j4N6RskRN7_Y,445
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/pensions_alimentaires/plafond.yaml,sha256=wmCVp_g_gmKSvI8k1Y0iKRr-T2clD_yvrQex1nNU_qs,11813
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/pensions_alimentaires/taux_jgt_2006.yaml,sha256=INhBp0XqTysOhTCbPe3rCoCg6WgOvFLcHCe1vPUJ9SQ,855
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/pertes_en_capital_societes_nouvelles/index.yaml,sha256=c5PWdojtYcFaFMMeQp8AtkDiPhGJiIuh-11kh6KEnpA,752
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/pertes_en_capital_societes_nouvelles/plafond_cb.yaml,sha256=cAhjEhR9tUQHIXRHptvcquiUaLmC2QghUIgZ0Lz6jKM,1076
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/charges_deductibles/pertes_en_capital_societes_nouvelles/plafond_da.yaml,sha256=4FXyq-22QPtWBmMo4G2jHcCcQRkqQL5724Ms0NzLkDo,857
@@ -872,7 +869,7 @@ openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deduc_invest_
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deduc_invest_locatif/dispositif_robien_recentre/taux_2_ans.yaml,sha256=UKNfR385kinPQlH7GzEQNvwge739PP3KDs_U1-70BMU,1570
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deduc_invest_locatif/dispositif_robien_recentre/taux_6_ans_borloo.yaml,sha256=WgfIh0sesZuAqXnYc4geT3KmuuYdKxMUM9ABnLAn4n4,1616
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deduc_invest_locatif/dispositif_robien_recentre/taux_7_ans.yaml,sha256=KlwhwlsSRU9z-oguo5LMCIxxhnxWBTdu5n9UNA_nYTw,1571
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/index.yaml,sha256=COjumwf6Zg6suznNIqBwqQNsVWqCOATOkc_vDN971cs,169
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/index.yaml,sha256=plVxwhyxgp_mhUU7KsT2lTVKF1mtxtOXKPKQlquA6r0,196
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abat_supp/index.yaml,sha256=wbd7aeyXlKAPogBHkmOccj-QF91U6WV_RoVwenWfs-8,647
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abat_supp/max.yaml,sha256=4NTkGMyNcdemCxNrINyYnQfGNoj8-2fcsTo5nywHmSA,4198
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abat_supp/salaire_plafond.yaml,sha256=FdyigzENaF3uPINEcv-NRFi-f42gSP7ThbkIAZW5Fp8,4225
@@ -886,11 +883,11 @@ openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/ab
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abatpro/min.yaml,sha256=JY9-Xe2yde1e4Xdc_zy7Z4TwYyGd25oBS3G6KahYMpU,6800
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abatpro/min2.yaml,sha256=y1hKzJx3uL-AszOiGV_viVpcYpqtJnOC7ua30VFn6Vs,4463
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abatpro/taux.yaml,sha256=6uJ22Cnl5uHdwPYDfjhvXiAw4R1O3Jw74vVNYvAc6l4,617
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abatviag/index.yaml,sha256=VcPGmLuGNogHwg58ivW2SIHNzbwMQcYPMY1ad5CLyW8,99
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abatviag/taux1.yaml,sha256=8KP65wZuc90TOFHCc9Rkw5hU6qahs33wziqaf2O5wPQ,392
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abatviag/taux2.yaml,sha256=_-EhJUn_wuH7jhy7M4hJxFqogEjT--3oNy_qsCY99Wg,415
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abatviag/taux3.yaml,sha256=eDA02d29DERhKJaZzShOEYPsPXeuyNGNe5JYPSdNZjQ,416
-openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abatviag/taux4.yaml,sha256=CEcIhCY91QBAVP8x9ZwgFKYjolfFGLueiwhA4-xuaSk,421
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abatviag/index.yaml,sha256=9OjJGJNcM0TN6pmbK7FMB4uYDQAjQuhtYRjofdlOB64,258
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abatviag/taux1.yaml,sha256=8op_AaoDe2DekLTdqoUJUuvIRLmWV2n1AW2hGqWZc8g,436
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abatviag/taux2.yaml,sha256=C-Oh-zFc7Zbyzk-sHBjU6RUu-WWzEpNgQNWdVvxkRag,438
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abatviag/taux3.yaml,sha256=5LZ_JoGmYzmwHhpIjQLLuiSjZyBvTWyEo_iX_7IO-oI,438
+openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/deductions/abatviag/taux4.yaml,sha256=1AqVQixPl86zOysGazN6F0v0gioPhmg1qC5L95W7VCY,442
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/exo_ir/index.yaml,sha256=vL36RKug6rqOrsHF2g4B2N_k9y7RNeD4iTZ14HUfAFo,219
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/exo_ir/conditions_ressources_exoneration_ir/apprentis_a_partir_2005.yaml,sha256=6hZK9B2JdvSynKIwjteDVfSk_z-ItPtnLDhNTkasmTY,623
 openfisca_france/parameters/impot_revenu/calcul_revenus_imposables/exo_ir/conditions_ressources_exoneration_ir/apprentis_avant_2005.yaml,sha256=CYC8Yj1PZnNTGcG9tIkx_y9weCF5x0dQ8F5ocCy26Ic,2192
@@ -3376,6 +3373,12 @@ openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_soc
 openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/cs/cmu/forfait_logement_sans_al/taux_2p.yaml,sha256=1N6C0k8k4rf7Et8dNp8jr7a5qzr1-vokZ-Nklpgg5os,851
 openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/cs/cmu/forfait_logement_sans_al/taux_3p_plus.yaml,sha256=nTHnXWivWHwnJTD68oLi9FBso6HZp1WiMbSQ5l7EJiI,853
 openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/cs/css/index.yaml,sha256=WgNJ9r1YcO2ej8-khhr9yFfJavCQkOFp1vSe0peTsNw,81
+openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/cs/css/abattements/aah.yaml,sha256=kOhUSpumG7IJK5vyVLRpSTIls83wcWeV4ivxocuL_Ls,781
+openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/cs/css/abattements/index.yaml,sha256=OKXnuJSiehezBYGLvXnTe51IqmsHDD5l3B3FvBozj34,108
+openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/cs/css/abattements/asi/couple.yaml,sha256=d4mUKavI72p29fKTCMI1Q8EzZ0V17kmDuRh9885t09A,529
+openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/cs/css/abattements/asi/personne_seule.yaml,sha256=U-1iV2BsrCz33F_2BQEmUbWw5B9BR1tM1AqtU5TsGx4,468
+openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/cs/css/abattements/aspa_asv/couple.yaml,sha256=6Yn83eSrcv3zWLVCdAdJfhk5xMkbJuC_79DTQvtOfCU,489
+openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/cs/css/abattements/aspa_asv/personne_seule.yaml,sha256=y7l2XT5YbHFz2BaZm0JDuQlnN6Fs6-PRtIPCE0oClc4,497
 openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/cs/css/forfait_logement_avec_al/index.yaml,sha256=w9-eAbnOWJTfLi4Tv2G61fAf6jPduq4DDdjxz-GLXwA,73
 openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/cs/css/forfait_logement_avec_al/taux_1p.yaml,sha256=g1h-Kyayvycv7pj02pswI7D0rjCVQIq_DZZu66KVg5w,747
 openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/cs/css/forfait_logement_avec_al/taux_2p.yaml,sha256=wOyZ3N36UERH08XYkSlLb90wG1U7gjMKq9HuMYzgB-c,748
@@ -4018,8 +4021,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.2.0.dist-info/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
-OpenFisca_France-169.2.0.dist-info/METADATA,sha256=EM_VtSnk3iki07noeohFmSAqTuFutTjGy0vBkBZG6Y0,20862
-OpenFisca_France-169.2.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-OpenFisca_France-169.2.0.dist-info/top_level.txt,sha256=1LbD6QJWehKGIcjtaJ45tbQOSDiFEXOlIdgWRI_jaHU,17
-OpenFisca_France-169.2.0.dist-info/RECORD,,
+OpenFisca_France-169.3.0.dist-info/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
+OpenFisca_France-169.3.0.dist-info/METADATA,sha256=i7nLsFwYhtHlVDzGpA-Nu4-kcsq-5Xd7S-WFETubuaM,20862
+OpenFisca_France-169.3.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+OpenFisca_France-169.3.0.dist-info/top_level.txt,sha256=1LbD6QJWehKGIcjtaJ45tbQOSDiFEXOlIdgWRI_jaHU,17
+OpenFisca_France-169.3.0.dist-info/RECORD,,

openfisca_france/model/prelevements_obligatoires/impot_revenu/charges_deductibles.py

@@ -578,12 +578,12 @@ class pensions_alimentaires_deduites(Variable):
         # foyer, la déduction est limitée à 2*max
         # S'il habite chez ses parents, max 3359, sinon 5698
         return (
-            min_(f6gi * (1 + taux_jgt_2006), max1)
-            + min_(f6gj * (1 + taux_jgt_2006), max1)
+            min_(f6gi * taux_jgt_2006, max1)
+            + min_(f6gj * taux_jgt_2006, max1)
             + min_(f6el, max1)
             + min_(f6em, max1)
-            + f6gp
-            * (1 + taux_jgt_2006) + f6gu
+            + f6gp * taux_jgt_2006
+            + f6gu
             )
 
 

openfisca_france/model/prelevements_obligatoires/impot_revenu/ir.py

@@ -3496,7 +3496,7 @@ class abat_spe(Variable):
         abattements = parameters(period).impot_revenu.calcul_revenus_imposables.abat_rni
 
         # Abattement pour personnes agées de + de 65 ans ou invalide
-        abattement_age_ou_invalidite = abattements.personne_agee_ou_invalide
+        abattement_age_ou_invalidite = abattements.contribuable_age_invalide
 
         # Abattement pour rattachement d'enfants mari·é·s
         abattement_enfant_marie = abattements.enfant_marie
@@ -3510,25 +3510,13 @@ class abat_spe(Variable):
         # Vecteur de montants d'abattement pour personnes âges ou invalides
         as_inv = (
             foyers_eligibles
-            * (
-                (
-                    + abattement_age_ou_invalidite.montant_1
-                    * (revenu_net_global <= abattement_age_ou_invalidite.plafond_1)
-                    )
-                + (
-                    + abattement_age_ou_invalidite.montant_2
-                    * (
-                        (revenu_net_global > abattement_age_ou_invalidite.plafond_1)
-                        & (revenu_net_global <= abattement_age_ou_invalidite.plafond_2)
-                        )
-                    )
-                )
+            * abattement_age_ou_invalidite.calc(revenu_net_global)
             )
 
         # Vecteur de montants d'abattement pour enfants à charge
         as_enf = (
             nombre_enfants
-            * abattement_enfant_marie.montant
+            * abattement_enfant_marie
             )
 
         # Le montant total d'abattement ne peut pas être supérieur au revenu net global
@@ -3632,29 +3620,29 @@ class nbptr(Variable):
 
         # parts des enfants en résidence alternée quand il n'y a que des enfants en résidence alternée
         enf_a = (no_pac & has_alt) * (
-            quotient_familial.enf1 * min_(nbH, 1)
-            + quotient_familial.enf2 * max_(min_(nbH - 1, 1), 0)
-            + quotient_familial.enf3_et_sup * max_(nbH - 2, 0)
+            quotient_familial.cas_general.enf1 * min_(nbH, 1)
+            + quotient_familial.cas_general.enf2 * max_(min_(nbH - 1, 1), 0)
+            + quotient_familial.cas_general.enf3_et_sup * max_(nbH - 2, 0)
             ) * 0.5
         # parts des enfants en résidence alternée quand il y a aussi des enfants entièrement à charge
         enf_b = (has_pac & has_alt) * (
             (nb_pac == 1) * (
-                quotient_familial.enf2 * min_(nbH, 1)
-                + quotient_familial.enf3_et_sup * max_(nbH - 1, 0)
+                quotient_familial.cas_general.enf2 * min_(nbH, 1)
+                + quotient_familial.cas_general.enf3_et_sup * max_(nbH - 1, 0)
                 ) * 0.5
-            + (nb_pac > 1) * (quotient_familial.enf3_et_sup * nbH * 0.5)
+            + (nb_pac > 1) * (quotient_familial.cas_general.enf3_et_sup * nbH * 0.5)
             )
         # parts des enfants entièrement à charge
         enf_c = (
-            quotient_familial.enf1 * min_(nb_pac, 1)
-            + quotient_familial.enf2 * max_(min_(nb_pac - 1, 1), 0)
-            + quotient_familial.enf3_et_sup * max_(nb_pac - 2, 0)
+            quotient_familial.cas_general.enf1 * min_(nb_pac, 1)
+            + quotient_familial.cas_general.enf2 * max_(min_(nb_pac - 1, 1), 0)
+            + quotient_familial.cas_general.enf3_et_sup * max_(nb_pac - 2, 0)
             )
 
         enf = enf_a + enf_b + enf_c
 
         # # note 2 : nombre de parts liées aux invalides (enfant + adulte)
-        n2 = quotient_familial.inv1 * (nbG + nbI / 2) + quotient_familial.inv2 * nbR
+        n2 = quotient_familial.couple_ou_pers_a_charge.inv1 * (nbG + nbI / 2) + quotient_familial.couple_ou_pers_a_charge.inv2 * nbR
 
         # # note 3 : Pas de personne à charge
         # - invalide
@@ -3668,23 +3656,23 @@ class nbptr(Variable):
         n3 = max_(n31, n32)
         # # note 4 Invalidité de la personne ou du conjoint pour les mariés ou
         # # jeunes veuf(ve)s
-        n4 = max_(quotient_familial.not41 * (1 * caseP + 1 * caseF), quotient_familial.not42 * (caseW | caseS))
+        n4 = max_(quotient_familial.couple_ou_pers_a_charge.not41 * (1 * caseP + 1 * caseF), quotient_familial.couple_ou_pers_a_charge.not42 * (caseW | caseS))
 
         # # note 5
         #  - enfant autre et parent isolé
-        n5 = quotient_familial.isol * caseT * (((no_pac & has_alt) * ((nbH == 1) * 0.5 + (nbH >= 2))) + 1 * has_pac)
+        n5 = quotient_familial.couple_ou_pers_a_charge.isol * caseT * (((no_pac & has_alt) * ((nbH == 1) * 0.5 + (nbH >= 2))) + 1 * has_pac)
 
         # # note 6 invalide avec personne à charge
-        n6 = quotient_familial.not6 * (caseP & (has_pac | has_alt))
+        n6 = quotient_familial.couple_ou_pers_a_charge.not6 * (caseP & (has_pac | has_alt))
 
         # # note 7 Parent isolé
-        n7 = quotient_familial.isol * caseT * ((no_pac & has_alt) * ((nbH == 1) * 0.5 + (nbH >= 2)) + 1 * has_pac)
+        n7 = quotient_familial.couple_ou_pers_a_charge.isol * caseT * ((no_pac & has_alt) * ((nbH == 1) * 0.5 + (nbH >= 2)) + 1 * has_pac)
 
         # # Régime des mariés ou pacsés
-        nb_parts_famille = 1 + quotient_familial.conj + enf + n2 + n4
+        nb_parts_famille = 1 + quotient_familial.cas_general.conj + enf + n2 + n4
 
         # # veufs  hors jeune_veuf
-        nb_parts_veuf = 1 + quotient_familial.veuf * (has_pac | has_alt) + enf + n2 + n3 + n5 + n6
+        nb_parts_veuf = 1 + quotient_familial.cas_general.veuf * (has_pac | has_alt) + enf + n2 + n3 + n5 + n6
 
         # # celib div
         nb_parts_celib = 1 + enf + n2 + n3 + n6 + n7
@@ -3697,18 +3685,18 @@ class nbptr(Variable):
 
         note 1 enfants et résidence alternée (formulaire 2041 GV page 10)
 
-        quotient_familial.conj : nb part associées au conjoint d'un couple marié ou pacsé
-        quotient_familial.enf1 : nb part premier enfant
-        quotient_familial.enf2 : nb part deuxième enfant
-        quotient_familial.enf3_et_sup : nb part enfants de rang 3 ou plus
-        quotient_familial.inv1 : nb part supp enfants invalides (I, G)
-        quotient_familial.inv2 : nb part supp adultes invalides (R)
+        quotient_familial.cas_general.conj : nb part associées au conjoint d'un couple marié ou pacsé
+        quotient_familial.cas_general.enf1 : nb part premier enfant
+        quotient_familial.cas_general.enf2 : nb part deuxième enfant
+        quotient_familial.cas_general.enf3_et_sup : nb part enfants de rang 3 ou plus
+        quotient_familial.couple_ou_pers_a_charge.inv1 : nb part supp enfants invalides (I, G)
+        quotient_familial.couple_ou_pers_a_charge.inv2 : nb part supp adultes invalides (R)
         quotient_familial.sans_pers_a_charge.not31 : nb part supp note 3 : cases W ou G pour veuf, celib ou div
         quotient_familial.sans_pers_a_charge.not32 : nb part supp note 3 : personne seule ayant élevé des enfants
-        quotient_familial.not41 : nb part supp adultes invalides (vous et/ou conjoint) note 4
-        quotient_familial.not42 : nb part supp adultes anciens combattants (vous et/ou conjoint) note 4
-        quotient_familial.not6 : nb part supp note 6
-        quotient_familial.isol : demi-part parent isolé (T)
+        quotient_familial.couple_ou_pers_a_charge.not41 : nb part supp adultes invalides (vous et/ou conjoint) note 4
+        quotient_familial.couple_ou_pers_a_charge.not42 : nb part supp adultes anciens combattants (vous et/ou conjoint) note 4
+        quotient_familial.couple_ou_pers_a_charge.not6 : nb part supp note 6
+        quotient_familial.couple_ou_pers_a_charge.isol : demi-part parent isolé (T)
         quotient_familial.edcd : enfant issu du mariage avec conjoint décédé;
         '''
         nb_pac = foyer_fiscal('nb_pac', period)
@@ -3744,29 +3732,29 @@ class nbptr(Variable):
 
         # parts des enfants en résidence alternée quand il n'y a que des enfants en résidence alternée
         enf_a = (no_pac & has_alt) * (
-            quotient_familial.enf1 * min_(nbH, 1)
-            + quotient_familial.enf2 * max_(min_(nbH - 1, 1), 0)
-            + quotient_familial.enf3_et_sup * max_(nbH - 2, 0)
+            quotient_familial.cas_general.enf1 * min_(nbH, 1)
+            + quotient_familial.cas_general.enf2 * max_(min_(nbH - 1, 1), 0)
+            + quotient_familial.cas_general.enf3_et_sup * max_(nbH - 2, 0)
             ) * 0.5
         # parts des enfants en résidence alternée quand il y a aussi des enfants entièrement à charge
         enf_b = (has_pac & has_alt) * (
             (nb_pac == 1) * (
-                quotient_familial.enf2 * min_(nbH, 1)
-                + quotient_familial.enf3_et_sup * max_(nbH - 1, 0)
+                quotient_familial.cas_general.enf2 * min_(nbH, 1)
+                + quotient_familial.cas_general.enf3_et_sup * max_(nbH - 1, 0)
                 ) * 0.5
-            + (nb_pac > 1) * (quotient_familial.enf3_et_sup * nbH * 0.5)
+            + (nb_pac > 1) * (quotient_familial.cas_general.enf3_et_sup * nbH * 0.5)
             )
         # parts des enfants entièrement à charge
         enf_c = (
-            quotient_familial.enf1 * min_(nb_pac, 1)
-            + quotient_familial.enf2 * max_(min_(nb_pac - 1, 1), 0)
-            + quotient_familial.enf3_et_sup * max_(nb_pac - 2, 0)
+            quotient_familial.cas_general.enf1 * min_(nb_pac, 1)
+            + quotient_familial.cas_general.enf2 * max_(min_(nb_pac - 1, 1), 0)
+            + quotient_familial.cas_general.enf3_et_sup * max_(nb_pac - 2, 0)
             )
 
         enf = enf_a + enf_b + enf_c
 
         # # note 2 : nombre de parts liées aux invalides (enfant + adulte)
-        n2 = quotient_familial.inv1 * (nbG + nbI / 2) + quotient_familial.inv2 * nbR
+        n2 = quotient_familial.couple_ou_pers_a_charge.inv1 * (nbG + nbI / 2) + quotient_familial.couple_ou_pers_a_charge.inv2 * nbR
 
         # # note 3 : Pas de personne à charge
         # - invalide
@@ -3780,23 +3768,23 @@ class nbptr(Variable):
         n3 = max_(n31, n32)
         # # note 4 Invalidité de la personne ou du conjoint pour les mariés ou
         # # jeunes veuf(ve)s
-        n4 = max_(quotient_familial.not41 * (1 * caseP + 1 * caseF), quotient_familial.not42 * (caseW | caseS))
+        n4 = max_(quotient_familial.couple_ou_pers_a_charge.not41 * (1 * caseP + 1 * caseF), quotient_familial.couple_ou_pers_a_charge.not42 * (caseW | caseS))
 
         # # note 5
         #  - enfant du conjoint décédé
-        n51 = quotient_familial.cdcd * (caseL & ((nbF + nbJ) > 0))
+        n51 = quotient_familial.couple_ou_pers_a_charge.cdcd * (caseL & ((nbF + nbJ) > 0))
         #  - enfant autre et parent isolé
-        n52 = quotient_familial.isol * caseT * (((no_pac & has_alt) * ((nbH == 1) * 0.5 + (nbH >= 2))) + 1 * has_pac)
+        n52 = quotient_familial.couple_ou_pers_a_charge.isol * caseT * (((no_pac & has_alt) * ((nbH == 1) * 0.5 + (nbH >= 2))) + 1 * has_pac)
         n5 = max_(n51, n52)
 
         # # note 6 invalide avec personne à charge
-        n6 = quotient_familial.not6 * (caseP & (has_pac | has_alt))
+        n6 = quotient_familial.couple_ou_pers_a_charge.not6 * (caseP & (has_pac | has_alt))
 
         # # note 7 Parent isolé
-        n7 = quotient_familial.isol * caseT * ((no_pac & has_alt) * ((nbH == 1) * 0.5 + (nbH >= 2)) + 1 * has_pac)
+        n7 = quotient_familial.couple_ou_pers_a_charge.isol * caseT * ((no_pac & has_alt) * ((nbH == 1) * 0.5 + (nbH >= 2)) + 1 * has_pac)
 
         # # Régime des mariés ou pacsés
-        nb_parts_famille = 1 + quotient_familial.conj + enf + n2 + n4
+        nb_parts_famille = 1 + quotient_familial.cas_general.conj + enf + n2 + n4
 
         # # veufs  hors jeune_veuf
         nb_parts_veuf = 1 + enf + n2 + n3 + n5 + n6

openfisca_france/model/prestations/minima_sociaux/cs/ressources.py

@@ -1,4 +1,4 @@
-from numpy import absolute as abs_, logical_or as or_, logical_not as not_
+from numpy import absolute as abs_, logical_or as or_, logical_not as not_, select
 
 from openfisca_core.periods import Period
 
@@ -8,6 +8,7 @@ from openfisca_france.model.base import (
     Famille,
     MONTH,
     ADD,
+    max_,
     TypesStatutOccupationLogement,
     TypesActivite,
     set_input_divide_by_period,
@@ -31,21 +32,21 @@ class css_cmu_base_ressources_individu(Variable):
 
     def formula(individu, period, parameters):
         # Rolling year
-        previous_year = Period(('year', period.start, 1)).offset(-1)
+        previous_year = compute_previous_year(period)
         # N-1
         last_year = period.last_year
         last_month = period.last_month
 
-        P = parameters(period).prestations_sociales.solidarite_insertion.minima_sociaux.cs.cmu
+        parametres_cmu = parameters(period).prestations_sociales.solidarite_insertion.minima_sociaux.cs.cmu
 
         ressources_a_inclure = [
-            'aah',
             'allocation_securisation_professionnelle',
-            'asi',
             'ass',
             'bourse_recherche',
             'caah',
             'chomage_net',
+            'css_base_ressources_aah_individu',
+            'css_base_ressources_asi_individu',
             'dedommagement_victime_amiante',
             'gains_exceptionnels',
             'indemnites_chomage_partiel',
@@ -82,11 +83,91 @@ class css_cmu_base_ressources_individu(Variable):
             + bourse
             + revenus_tns(individu, previous_year, last_year)
             - pensions_alim_versees
-            - abbattement_chomage(individu, period, previous_year, P)
+            - abattement_chomage(individu, period, previous_year, parametres_cmu)
             - neutralisation_stage_formation_pro(individu, previous_year, last_month)
             )
 
 
+class css_base_ressources_aah_individu(Variable):
+    value_type = float
+    label = "Base de ressources AAH de l'individu prise en compte pour l'éligibilité à la CSS après application de l'abattement"
+    reference = [
+        'Bulletin officiel Santé - Protection sociale - Solidarité n° 2021/6 du 16 avril 2021 - Instruction interministérielle N° DSS/SD2A/2021/71 du 30 mars 2021',
+        'https://sante.gouv.fr/fichiers/bo/2021/2021.6.sante.pdf#page=75',
+        'Bulletin officiel Santé - Protection sociale - Solidarité n° 2023/24 du 29 décembre 2023 - Instruction interministérielle N° DSS/SD2A/2023/98 du 22 décembre 2023',
+        'https://sante.gouv.fr/fichiers/bo/2023/2023.24.sante.pdf#page=82',
+        ]
+    entity = Individu
+    definition_period = MONTH
+    set_input = set_input_divide_by_period
+
+    def formula(individu, period, parameters):
+        return individu('aah', period)
+
+    def formula_2021_04(individu, period, parameters):
+        return max_(individu('aah', period) - parameters(period).prestations_sociales.solidarite_insertion.minima_sociaux.cs.css.abattements.aah, 0)
+
+
+class css_base_ressources_asi_individu(Variable):
+    value_type = float
+    label = "Base de ressources ASI de l'individu prise en compte pour l'éligibilité à la CSS après application de l'abattement"
+    reference = [
+        'Bulletin officiel Santé - Protection sociale - Solidarité n° 2021/6 du 16 avril 2021 - Instruction interministérielle N° DSS/SD2A/2021/71 du 30 mars 2021',
+        'https://sante.gouv.fr/fichiers/bo/2021/2021.6.sante.pdf#page=75'
+        ]
+    entity = Individu
+    definition_period = MONTH
+    set_input = set_input_divide_by_period
+
+    def formula(individu, period, parameters):
+        return individu('asi', period)
+
+    def formula_2021_04(individu, period, parameters):
+
+        aah = individu('aah', period)
+        asi = individu('asi', period)
+        asi_famille = individu.famille.members('asi', period)
+        nb_allocataire_asi = individu.famille.sum(asi_famille > 0, role=Famille.PARENT)
+
+        abattement_asi_personne_seule = parameters(period).prestations_sociales.solidarite_insertion.minima_sociaux.cs.css.abattements.asi.personne_seule
+        abattement_asi_couple = parameters(period).prestations_sociales.solidarite_insertion.minima_sociaux.cs.css.abattements.asi.couple
+
+        condition_abattement_asi_couple = nb_allocataire_asi > 1
+        condition_abattement_asi_personne_seule = asi > 0
+        abattement_asi = select(
+            [aah > 0, condition_abattement_asi_couple, condition_abattement_asi_personne_seule],
+            [0, abattement_asi_couple / 2, abattement_asi_personne_seule],
+            0)
+
+        montant_asi = asi - abattement_asi
+        return max_(montant_asi, 0)
+
+
+class css_base_ressources_aspa_asv(Variable):
+    value_type = float
+    label = "Base de ressources ASPA/ASV de pour une famille prise en compte pour l'éligibilité à la CSS après application de l'abattement"
+    reference = [
+        'Bulletin officiel Santé - Protection sociale - Solidarité n° 2021/6 du 16 avril 2021 - Instruction interministérielle N° DSS/SD2A/2021/71 du 30 mars 2021',
+        'https://sante.gouv.fr/fichiers/bo/2021/2021.6.sante.pdf#page=75'
+        ]
+    entity = Famille
+    definition_period = MONTH
+    set_input = set_input_divide_by_period
+
+    def formula(famille, period, parameters):
+        return famille('aspa', period)
+
+    def formula_2021_04(famille, period, parameters):
+        aspa = famille('aspa', period)
+        aspa_couple = famille('aspa_couple', period)
+        abattement_aspa_personne_seule = parameters(period).prestations_sociales.solidarite_insertion.minima_sociaux.cs.css.abattements.aspa_asv.personne_seule
+        abattement_aspa_couple = parameters(period).prestations_sociales.solidarite_insertion.minima_sociaux.cs.css.abattements.aspa_asv.couple
+        return select(
+            [(aspa > 0) * aspa_couple, aspa > 0],
+            [max_(aspa - abattement_aspa_couple, 0), max_(aspa - abattement_aspa_personne_seule, 0)],
+            aspa)
+
+
 class css_cmu_base_ressources(Variable):
     value_type = float
     label = "Base de ressources prise en compte pour l'éligibilité à la ACS / CMU-C / CSS"
@@ -95,12 +176,12 @@ class css_cmu_base_ressources(Variable):
     set_input = set_input_divide_by_period
 
     def formula(famille, period, parameters):
-        previous_year = Period(('year', period.start, 1)).offset(-1)
+        previous_year = compute_previous_year(period)
 
         ressources_famille_a_inclure = [
             'af',
             'asf',
-            'aspa',
+            'css_base_ressources_aspa_asv',
             'cf',
             'paje_clca',
             'paje_prepare',
@@ -115,7 +196,7 @@ class css_cmu_base_ressources(Variable):
         css_cmu_forfait_logement_base = famille('css_cmu_forfait_logement_base', period)
         css_cmu_forfait_logement_al = famille('css_cmu_forfait_logement_al', period)
 
-        P = parameters(period).prestations_sociales.solidarite_insertion.minima_sociaux.cs.cmu
+        parametres_cmu = parameters(period).prestations_sociales.solidarite_insertion.minima_sociaux.cs.cmu
 
         proprietaire = (statut_occupation_logement == TypesStatutOccupationLogement.proprietaire)
         heberge_titre_gratuit = (statut_occupation_logement == TypesStatutOccupationLogement.loge_gratuitement)
@@ -130,7 +211,7 @@ class css_cmu_base_ressources(Variable):
         ressources_parents = famille.sum(ressources_individuelles, role = Famille.PARENT)
 
         age = famille.members('age', period)
-        condition_enfant_a_charge = (age >= 0) * (age <= P.age_limite_pac)
+        condition_enfant_a_charge = (age >= 0) * (age <= parametres_cmu.age_limite_pac)
         ressources_enfants = famille.sum(ressources_individuelles * condition_enfant_a_charge, role = Famille.ENFANT)
 
         return forfait_logement + ressources_famille + ressources_parents + ressources_enfants
@@ -138,12 +219,17 @@ class css_cmu_base_ressources(Variable):
 # Helper functions
 
 
+def compute_previous_year(period):
+    return Period(('year', period.start, 1)).offset(-1)
+
 # Abattement sur revenus d'activité si :
 # - IJ maladie
 # - chômage
 # - ass
 # - formation professionnelle
-def abbattement_chomage(individu, period, previous_year, P):
+
+
+def abattement_chomage(individu, period, previous_year, parametres_cmu):
     indemnites_journalieres_maladie = individu('indemnites_journalieres_maladie', period)
 
     chomage = individu('activite', period) == TypesActivite.chomeur
@@ -163,7 +249,7 @@ def abbattement_chomage(individu, period, previous_year, P):
 
     salaire_net = individu('salaire_net', previous_year, options = [ADD])
 
-    return eligibilite_abattement_chomage * salaire_net * P.abattement_chomage
+    return eligibilite_abattement_chomage * salaire_net * parametres_cmu.abattement_chomage
 
 
 # Revenus de stage de formation professionnelle exclus si plus perçus depuis 1 mois