OpenFisca-France 167.1.1__py3-none-any.whl → 168.0.0__py3-none-any.whl

{OpenFisca_France-167.1.1.data → OpenFisca_France-168.0.0.data}/data/share/openfisca/openfisca-france/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 168.0.0 [2331](https://github.com/openfisca/openfisca-france/pull/2331)
+
+* Amélioration technique.
+* Périodes concernées : toutes.
+* Zones impactées : 
+  - `openfisca_france/parameters/prelevements_sociaux/contributions_sociales/`
+  - `openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/activite.py`
+  - `openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/base.py`
+  - `openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/remplacement.py`
+  - `openfisca_france/model/prestations/complement_are.py`
+  - `openfisca_france/model/prestations/`
+
+* Détails :
+  - Supprime des paramètres de taux de crds en doublon par rapport à la législation
+  - Supprime des doublons de fonction de calcul des montants de csg et crds
+  - Supprime des doublons de barème d'abattement sur la base ressource pour la csg + corrige ce barème
+  - Corrections des noms de label et descriptions dans les paramètres de la csg + ajout de références
+
 ### 167.1.1 [2326](https://github.com/openfisca/openfisca-france/pull/2326)
 
 * Évolution du système socio-fiscal.

{OpenFisca_France-167.1.1.dist-info → OpenFisca_France-168.0.0.dist-info}/METADATA

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

{OpenFisca_France-167.1.1.dist-info → OpenFisca_France-168.0.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-OpenFisca_France-167.1.1.data/data/share/openfisca/openfisca-france/CHANGELOG.md,sha256=7llVDe81SzsofiIhEansESpIVQYyTPDXs_ycfCXQfRs,445329
-OpenFisca_France-167.1.1.data/data/share/openfisca/openfisca-france/README.md,sha256=nIa6V4zevZpj2DX1rcpgs6AATTerCCy4622S1D3-CDI,18642
+OpenFisca_France-168.0.0.data/data/share/openfisca/openfisca-france/CHANGELOG.md,sha256=-qlLMfpTJHyj9lqToFCTucYmN0ELSHojsmobBEsM5M0,446389
+OpenFisca_France-168.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
@@ -52,11 +52,11 @@ openfisca_france/model/prelevements_obligatoires/impot_revenu/prelevements_forfa
 openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/taxes_salaires_main_oeuvre.py,sha256=18HUjZggsBkSWejZxslHauOMT24KDdoeiOGzt8W35uM,31997
 openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/activite.py,sha256=OmG31xT1KPMjqVNzJCVWeCXGYdpRDVorZkFaGqtwRIg,21722
-openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/base.py,sha256=DLdsTWEftUCGyNW0D64n4MN2vVK9DnIBRTSOuwpQ110,897
-openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/capital.py,sha256=OKk6jmWQPaov9ieHSUjDTtCxc4nY90bxTM8WrWEsJHQ,24010
+openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/activite.py,sha256=b1E263kl8Hc44Ot31cvSNaHj2Zfo5oAmfETOBhKbDHo,21951
+openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/base.py,sha256=JR7KnAiY5mXIVxsWxG3opKYapcgU0U2ivnLX56gUiy0,1608
+openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/capital.py,sha256=nylNGD4wJ9ayIfoJu1LIqtPWZ2TSMAbEM5mnkc1aHhY,24001
 openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/csg_crds.py,sha256=qQ-dHhoBG_5Xd7DvkUmK7h2HG-w7VhpSk8MN5bilcOQ,5530
-openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/remplacement.py,sha256=3JQLHUB_Dsb30T61CDRYUskDqwIdUgBFbS6fwy1-nho,32174
+openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/remplacement.py,sha256=Kz0rkibtZ5GzgTJvZ8K6PmnHn7Gap4LUU-w8Bj0biYw,30421
 openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/versement_transport.py,sha256=dkD3P0PEMu339ZHi3N7qQ0XIYQh007IFF1g_CMdU954,3542
 openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/allegements.py,sha256=YgHJ0JWprWyoaKNK2PQSI_Uuy-f0ISd1ZDmVJKzbG6s,26075
@@ -79,11 +79,11 @@ openfisca_france/model/prestations/agepi.py,sha256=QRjafsxsObAjW2A31mzrOmXnzmKx0
 openfisca_france/model/prestations/aide_mobilite.py,sha256=SqzPIkkEZAgKoEbc73d3bhsYhFxZaN1o2Ik4gTm7VWY,20560
 openfisca_france/model/prestations/aide_permis_demandeur_emploi.py,sha256=7V8gVzI9Rgg60lxqddrrIqhjqe06J2GfMQoSXKrdY7I,3410
 openfisca_france/model/prestations/aide_permis_pro_btp.py,sha256=bzh9cDpJetqn72S2ziQJlhZuJrtOw-tYSDBOYKIML48,2258
-openfisca_france/model/prestations/aides_logement.py,sha256=mxmfUOnPvZwLjPdwEEppDq3hlQ4jagDS67ZlAaRUUqw,90797
+openfisca_france/model/prestations/aides_logement.py,sha256=WAm8_cDM3dEzB8zGVvEISO_ssKBCx3-aEdT5otuFOMY,90790
 openfisca_france/model/prestations/alimentation.py,sha256=3gkbQrPdobAHmroJiG07ajxzWjLlyMhMh6kMvg4s4Hk,2350
 openfisca_france/model/prestations/autonomie.py,sha256=7UpuhDO-LFjwbq3UWSDyOKJCsTw1rx8O-tS3dG-MBn8,19394
 openfisca_france/model/prestations/cheque_energie.py,sha256=lwl1GSmI1dUwTm4tJUyJydcSguSPtPfpbUIOxl9ab64,6039
-openfisca_france/model/prestations/complement_are.py,sha256=_i58DZV1SfHIHc1ZwibOZ-fHAbnC7NrDno5EobY_LMY,16495
+openfisca_france/model/prestations/complement_are.py,sha256=A3w76QuTfglsUmErWLpRbrFHqPECnZT3uDE1KgJWcTc,16530
 openfisca_france/model/prestations/depart1825.py,sha256=2TJYxttcBJbSqpqs-3Wh6yB1-zARnnR396kkgQx_Quw,2528
 openfisca_france/model/prestations/education.py,sha256=oiT5rQ7aSF89qL3WCwBMSpzwgc1ZWdJ7FVn-_o9GBks,17551
 openfisca_france/model/prestations/locapass.py,sha256=74K8V6SMqk-vG2x5-e4nbtym8sRDzRPp8_8OYwpCIv4,4853
@@ -114,10 +114,10 @@ openfisca_france/model/prestations/minima_sociaux/__init__.py,sha256=47DEQpj8HBS
 openfisca_france/model/prestations/minima_sociaux/aah.py,sha256=JTEQ9HzlXtaJUplQsOSZ_OeDn3ISDdeGjmPoIMtMdr0,44603
 openfisca_france/model/prestations/minima_sociaux/ada.py,sha256=IcJU3BUEsEk59K-W55CyNyafmy6SMv2jpB8eHob7ceE,1426
 openfisca_france/model/prestations/minima_sociaux/aefa.py,sha256=mXOBJgXTl_iA6aaJw4E9M1Z7j97J2OEQ6rInGSuug5s,3357
-openfisca_france/model/prestations/minima_sociaux/anciens_ms.py,sha256=POLijB0kDU6w7VtDHmtz9v5YFGxlin6rXeTX-ixnhRc,10885
+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=w-yYVrGnhFv3ABUnofyWzByY2CfkD_CqOllwg-cYtvc,24572
+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/cs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openfisca_france/model/prestations/minima_sociaux/cs/acs.py,sha256=nwihxwsjKAmgPBW3jB2GcCSOxWJuQKgNhTj_gLZ-xAw,2435
@@ -127,12 +127,12 @@ openfisca_france/model/prestations/minima_sociaux/cs/eligibilite.py,sha256=3Y4eA
 openfisca_france/model/prestations/minima_sociaux/cs/ressources.py,sha256=IbxBHslyqPHQRs1cjvQ9ax84QyERgTzKIzrJNt1urm0,7552
 openfisca_france/model/prestations/prestations_familiales/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openfisca_france/model/prestations/prestations_familiales/aeeh.py,sha256=6a0KZq3hG1O1SvFJGdF1etq0yzcmEU3TNiY9wCENkDQ,5574
-openfisca_france/model/prestations/prestations_familiales/af.py,sha256=GqMksdaXru6mv4ApMTdFxlvI9f6B9vnmFjwJ2kcf_Fg,18376
-openfisca_france/model/prestations/prestations_familiales/ars.py,sha256=4BYqD7V7HRDhgI5PmDvbaZca9_uyRUshLSIssZg1Btk,5351
-openfisca_france/model/prestations/prestations_familiales/asf.py,sha256=DzrALWHV6xmAle5X0lDvINf2oMkWd88k4Nsl4M-hpJQ,3588
+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/cf.py,sha256=ErXwPoEvdyxklzmZJ41gK3ERWOK_PFl7Xh7wMK2hVSU,13718
-openfisca_france/model/prestations/prestations_familiales/paje.py,sha256=lE65do502cU3WA113OfFyXSVkJKMY40N9SsGkUAKg0Y,48252
+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
 openfisca_france/model/revenus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openfisca_france/model/revenus/autres.py,sha256=LttEzxate9Crynjp3SOlHr-CUGDXEUTjzszzp2U7z_U,5109
@@ -1353,33 +1353,25 @@ openfisca_france/parameters/prelevements_sociaux/contributions_assises_specifiqu
 openfisca_france/parameters/prelevements_sociaux/contributions_assises_specifiquement_accessoires_salaire/taxe_contribution_prevoyance/taux.yaml,sha256=9c3Yo7ApJTG8ov6KWSvt2lwdwq2ikGY6etyaXyTUg1I,849
 openfisca_france/parameters/prelevements_sociaux/contributions_sociales/index.yaml,sha256=44KRu3tvhjRED103edq415U_xZu14sl1tqSYiRNlBag,227
 openfisca_france/parameters/prelevements_sociaux/contributions_sociales/crds/index.yaml,sha256=Ky7sFFcg6NA7Tia1EHRw858i7ZO6GOaC5LqPS0qCjyg,223
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/crds/taux_global.yaml,sha256=76UzQfTuqHzTTmOeNm1YH4H2cxE-R7p-eRBLvH2l4lE,601
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/crds/activite/abattement.yaml,sha256=DdBjAUj-XKDGqGW4jk8Sm0lFrrCd748dGjOX_U0M_ak,1055
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/crds/activite/index.yaml,sha256=HAF_PNtpbjWX3fxwleBF0fIZNDrtMQsH2NIVnBGYgTE,209
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/crds/activite/taux.yaml,sha256=bpk1kVMGrYrbTcNK3DwYz3PsAtWrkG2SiGpH6_4EWUo,641
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/crds/retraite/index.yaml,sha256=ub2AZx2xDawkxK7JwW4D4LFfaA8m7_J2BjSj4R0JUtM,179
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/crds/retraite/taux.yaml,sha256=sduRguUX0b3JM2kUXY-9Ge-TmEYM8abRAluLKiPDLm0,640
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/crds/taux.yaml,sha256=76UzQfTuqHzTTmOeNm1YH4H2cxE-R7p-eRBLvH2l4lE,601
 openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/index.yaml,sha256=SNoQoHxKOxTh0HuIwzqnWKzl77dT_PEiNWvvTS_oJsE,851
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/index.yaml,sha256=WQvtJnc9uOOjZ9TUum1G7gFluUqFGzQcMVSTHR1iPK8,220
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/taux_global.yaml,sha256=6EH_7ElVm9-Zf2o3LnxV0dL73bNNfU8BQcoUL_n07yg,2421
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/deductible/abattement.yaml,sha256=IfdHF6yRrVCvSOjexhb7iI-HMGG5t0uMIsNn1R31QwM,2375
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/deductible/index.yaml,sha256=qJaG6DCitResjWcN7Bn4x3LvZ8rHUpl_crmq4eZoWJo,202
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/deductible/taux.yaml,sha256=Aey1ufEDlTwfj3Ow3gfjowmmt_2qMFOfC-ISVijAHJo,2091
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/imposable/abattement.yaml,sha256=jtl6WNQ1X9FO6ftgH8RY4PACjjVgAoUNcr8LoybPIes,2373
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/imposable/index.yaml,sha256=HFe1KNwzECDuI4k0eXEVkf_7A89Ss5htw9yN3csqShY,198
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/imposable/taux.yaml,sha256=LQlHACz6QLWoQ3VlNn-aYIroVy3pyqsCFFY8K1aoCNQ,1443
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/abattement.yaml,sha256=JZc7_HxfxbAyTaoAfyWLNHjOklutEQoz9ipZnt6WtvY,2598
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/index.yaml,sha256=exfMUG3GuWTgJdCN3dxxbPxJRAOeFmzJaMuQIj7fdtk,249
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/taux_global.yaml,sha256=eXWY0A88fakMy57_Kh_dsFMuFdof_TNWFDYaPQZkRV8,2421
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/deductible/index.yaml,sha256=O8MJElmqds5kUS4sszQb_GIjBPEN-5PoCWfh8LJFng0,187
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/deductible/taux.yaml,sha256=pziqA_wlCthzfkgL5kaujWPgMRnHqsjVospZOxWUMK8,2079
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/imposable/index.yaml,sha256=7TDN5XL2YRx-wVkXLzgWwlrlE_tfOCzsSenBDzgUXjg,183
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/activite/imposable/taux.yaml,sha256=7u8QOlwvztyQPQ7eJqFTUFZnkQI03ayxX2kf80yEJTE,1443
 openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/index.yaml,sha256=7wLBjnUO0P0xKUWBgGh-nMf_13PRvpQLJEANB5ixEE0,328
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/index.yaml,sha256=Qr3nW24nRwZ-xBU28j-8t2c8jCuJuljCrfBfuYXyRl4,170
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/min_exo.yaml,sha256=shVOR0YX0QDMDDsArWyvMK1BYRWFDaaS3fZdJb__qR0,563
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/taux_global.yaml,sha256=vN_HGt_1g-6rTgf_eVNzqshZRU9Q7u8DwXeMHaMeGqw,1194
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/deductible/abattement.yaml,sha256=hgD4Rq6uLOcLGFbpcynid86qMl27JMRjWEbz73bU1-A,2282
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/deductible/index.yaml,sha256=TkGyRuWA9e5dDPyKAH6hI2tBTdcdQNXUcVZPQCXltl8,177
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/deductible/taux_plein.yaml,sha256=FnHnIKL3XNUMUxQSP7pBYdBK3aW_WCrRJUJD4uRRGuk,1427
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/deductible/taux_reduit.yaml,sha256=N6IRBzXbIpaUxpENGfOJS8XRqo-xFM_9UYaThTnfzOA,1277
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/imposable/abattement.yaml,sha256=J4WR6it5h47EXkuG9QGULMgCHn3fMlhhweZpX3mcYiM,2283
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/imposable/index.yaml,sha256=tthpCCSl82RHWGGetRp6-vMJW-8KZSIvn-IrPujkFSM,133
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/imposable/taux_plein.yaml,sha256=53nNxvNBQKKjVxhHdIEX9q_n2mvBCA3sBM4itcpuz9o,996
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/imposable/taux_reduit.yaml,sha256=l0Kavoq2ztmbUj4gKuvaTPQYwwasUAP9JM_QWiroQ0E,745
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/index.yaml,sha256=jo-mN2vj3ikZFmWLalonndhM5ECEg3bc_WU53ko_LhU,188
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/min_exo.yaml,sha256=mn42new2YlVvlTi8bq5iOJ9ydXQmJWuV4krNaT0kJkk,763
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/taux_global.yaml,sha256=0UNXoNHXqgdmlQNB2DYsMGeIThow9WTx6HJi_xPj3SE,1194
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/deductible/index.yaml,sha256=68FBHiSIoDRYFEH_tGQ4l8TSAz3rF0AdU4xyv3mtpOw,399
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/deductible/taux_plein.yaml,sha256=gaURDLRNmGVaONooUqkWtPlNB42WgCcgBRYBnF0HtCs,1585
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/deductible/taux_reduit.yaml,sha256=B32k6EDKJNM-YP569933VcDRUtiFlwcffAlJjlyAWsY,1435
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/imposable/index.yaml,sha256=1Rlg4aADYZgSMVxWWHQk0vjJfTQPqguWNpyZPjPP0Ls,394
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/imposable/taux_plein.yaml,sha256=FIZWs0oV5T60IM-RfVZYqgYOM-UZxMjC-5aeW_S4v7s,911
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_chomage/imposable/taux_reduit.yaml,sha256=NosC_8CjMtLxWsaWL4-rg7d1kWJ01XKQCbM8pT92Pww,660
 openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_preretraite/index.yaml,sha256=ICUzUI6Aou7Gh5eYxcJelKcs7mAt1MBNmguAmezujpI,231
 openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_preretraite/taux_global.yaml,sha256=T5gLCGkHjBQJrnbtH8CVgRN883bqLs7MVgC4a7XAuTM,2816
 openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/allocations_preretraite/deductible/index.yaml,sha256=QSG7p-uULNnneRVEQsbR1hTgSdfrju83s48QYkBqUjc,184
@@ -1394,29 +1386,29 @@ openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remp
 openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/indemnites_journalieres/deductible/taux.yaml,sha256=doHTvbDmnxKLov-ctOYQU_8mZQhk_cOQLU9z3x9CkmY,1222
 openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/indemnites_journalieres/imposable/index.yaml,sha256=66PO89eiAUIKF_Vptb7l4wVUfzCqfItXsBkIifgz_9o,143
 openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/indemnites_journalieres/imposable/taux.yaml,sha256=GbE_P3WEcLK6LHWzldM8QXdlpnZUJt4BWQtf5L2ZhTM,632
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/index.yaml,sha256=OF7K__EqQFnAzKIh415W0CmXjMLhR4YD2qPZF5dKBCQ,235
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/taux_median.yaml,sha256=RmKXoWjlnijzdj9vfgFyv01LEOscaaIY_WysmVLkHhw,2566
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/taux_plein.yaml,sha256=i-vP0HfN6MJinsVq_UDQr5y3KRqI4QeieanklyRN_cc,2317
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/taux_reduit.yaml,sha256=ACEbV4w-7y3Mk2_MtzLSOGHMrYSHRv3D9ch1HHEvgNc,1598
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/deductible/index.yaml,sha256=2mhKg-zujix1QLu9aFvwHwzEODvaiup1gVvKOSrhqn8,210
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/deductible/taux_median.yaml,sha256=q5T-rv-BLRPoQqzG8V5ESDRKULlqx5HFkr5Ks7l8pcA,2103
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/deductible/taux_plein.yaml,sha256=nfdndpKiiG30gDwNTKFnb3-xNsEntUWd_BwPsb71wh4,2877
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/deductible/taux_reduit.yaml,sha256=p0Iatl3Ixnh1vDzQEqSEbfkDigJpRkWcPpeAT-I81r4,1706
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/imposable/index.yaml,sha256=q-amTnp7Cr-3-94h5OOe5Fk92SWj2iisCeEHSpbd8j8,206
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/imposable/taux_median.yaml,sha256=MXWQFCUJTQwxSM0rzSEpVuc4JgXtpXbNGrHjFiGlR5M,424
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/imposable/taux_plein.yaml,sha256=53yay9clBk2rKbw6ZB7cDaXVlmGkUpEw-DzgidPlnxU,431
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/imposable/taux_reduit.yaml,sha256=PIXTHa5u241lbutBW1no2OTP0M_zlCBWxVdhRCCFZcg,1114
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/index.yaml,sha256=XJ-RJyiVWxdRN52IV9DRMWqp8ja5NLrRhnDnoVcHWBw,631
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/index.yaml,sha256=LnveqLOA7ewjr1zm3QrL9Wv2VNj396ttnW379FS5tm8,253
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/taux_median.yaml,sha256=0WAI14rElBlS_v7547RuMV1BX_a88RBS0AAdws06ndM,2566
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/taux_plein.yaml,sha256=L0omeYlbhILzbRpSICFmSebOoQibAVk3J1kHU-8nDdE,2317
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/taux_reduit.yaml,sha256=-R3spqv372mouBs3mbe1sdiHx5uSCs4awgzt6_Yhs5U,1598
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/deductible/index.yaml,sha256=hvaDZGTmRKRyKgWD3jKCdKJezSUKJQEqjQRPiPrmGwA,1440
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/deductible/taux_median.yaml,sha256=Cv7rLacXhmjZmMJEE9saplwMIemMTO-wdu1dreNBs1o,1109
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/deductible/taux_plein.yaml,sha256=dB9q9daMkI0zH6CpFORORZHCYBZbpjlpST3vB1NIZZM,1717
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/deductible/taux_reduit.yaml,sha256=5Or71AgvBesp8MbKTODSqEmano_N4v4qRfQ4I39r2Tw,689
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/imposable/index.yaml,sha256=khAd12Z4JkxrCSEQyDDQssLCqDpFOuuYmj-QGnKj95A,405
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/imposable/taux_median.yaml,sha256=jlFxnHPkKeBuo7EdA7i4nfOCjSuRGD9Bx-7jH2A5l-M,461
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/imposable/taux_plein.yaml,sha256=J9JzjWChmA8WwqGYHFZstn4U0-nEFgERo7IIdcKR_gk,445
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/pensions_retraite_invalidite/imposable/taux_reduit.yaml,sha256=oUwPhfm357i3V66dd5bRCF3hRVHPUy-Fw-QYmDgQ2Ik,1201
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/index.yaml,sha256=cdUHSMAkZtBvf4CizmThIXD-QBRsmhl8eMK_EyNAeWc,677
 openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_ir.yaml,sha256=wmXp4gufo3jobC2kW1nw2Uv8NzfVRtyaBRbweVzX3PQ,2401
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr1/demi_part_suppl_rfr1.yaml,sha256=0ACYQGlqprCNJfuUaICdqH6L96W9DVsCPl8EuNriJNM,5533
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr1/index.yaml,sha256=77lBCWYTjOMPA6pIktXGZNjlo3jSzf-gUbmVHY6qQ_I,307
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr1/seuil_rfr1.yaml,sha256=tcRMvX7u3UaX80uzaJS1CeP1CVSZK5tJ_2KLFLYSn08,5502
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr2/demi_part_suppl_rfr2.yaml,sha256=P3TVp6skCL6PjEnaia7ZEcxUSnpoX2Ut-NR5uyWrjAI,5533
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr2/index.yaml,sha256=1D9dINBDVGwHmo11PV30-0dQBf6MNd2BGqp8zf9YjVw,307
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr2/seuil_rfr2.yaml,sha256=o94zKwdKgEnEIJBDRq4p0GCjnzFvksbZW4D0JKhfkt8,5502
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr3/demi_part_suppl_rfr3.yaml,sha256=Q-GKcMPCmc5F4WVPJd5UUBR19OfxwjR-4TdwaYxmMTg,3863
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr3/index.yaml,sha256=qFGVsX8dkM5OkIGI6bVPPIuTj6sY9EXsQUX79IUiZfQ,303
-openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr3/seuil_rfr3.yaml,sha256=z2iFt62XLdUIypMF4-c6omMIa02RgvJK84uuvfoWJ7I,3790
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr1/demi_part_suppl_rfr1.yaml,sha256=nCSsNlaMgUk6eIGCsoy1qImVTcElQJK-ZHCSRYDLzj0,5559
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr1/index.yaml,sha256=dm5bVx4Qn-YrWFTuJnARvcmXWm15ZTX7NCgcGRdTc0g,333
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr1/seuil_rfr1.yaml,sha256=at6bNVkndOYjiSVdTfPyHlttbL0fKoEE2viRVcBgfmI,5700
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr2/demi_part_suppl_rfr2.yaml,sha256=JwGkuUc7yJsOpC2W5V8MGJHfrE7kwECsDFmgHkomiT0,5580
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr2/index.yaml,sha256=DCkkEJTiRX7a21SoKYheSNf77l81q8XdqA5-GgjhFAI,415
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr2/seuil_rfr2.yaml,sha256=v3df6yr4AUIh34pYGf1GMUu45eeg_BSXX6VmEgqCVWM,5725
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr3/demi_part_suppl_rfr3.yaml,sha256=SXjC0J5N1Q4QnfO-dpwpvOuo73h8nQ8RVdKcjJZbDik,3863
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr3/index.yaml,sha256=tX6a6a3APsislYy6PI5wAllfN8nd0eMu1sVM0F6KD7s,432
+openfisca_france/parameters/prelevements_sociaux/contributions_sociales/csg/remplacement/seuils/seuil_rfr3/seuil_rfr3.yaml,sha256=ih9iUiYSvvnUNHH6dHLyV-sTpiGuCDVq5DOWSDU3oLY,3962
 openfisca_france/parameters/prelevements_sociaux/cotisations_regime_assurance_chomage/index.yaml,sha256=bBaSHF0PLhmPxs-n0B4r5ayAAncv5Vcxhv5TTRRoFLU,199
 openfisca_france/parameters/prelevements_sociaux/cotisations_regime_assurance_chomage/ags/index.yaml,sha256=SpHR-QBycknE_N_cccten8qb-PcpzzLrJraNuzpj_Ag,639
 openfisca_france/parameters/prelevements_sociaux/cotisations_regime_assurance_chomage/ags/employeur/ags.yaml,sha256=K5B01ylmgUUOz5t4N26F64RIfQO9QjDAihX4pBxh8OU,4661
@@ -4023,8 +4015,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-167.1.1.dist-info/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
-OpenFisca_France-167.1.1.dist-info/METADATA,sha256=7NFKfXXWL51WKB82uAfoVUEY3K9cDafcPxw3rM4cVm8,20517
-OpenFisca_France-167.1.1.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-OpenFisca_France-167.1.1.dist-info/top_level.txt,sha256=hmd7WhmLN_CyB52sP702pN9WlJqO9YMVuzeBRNp3hfs,23
-OpenFisca_France-167.1.1.dist-info/RECORD,,
+OpenFisca_France-168.0.0.dist-info/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
+OpenFisca_France-168.0.0.dist-info/METADATA,sha256=E_XhzkfTgeCDBW4XV1JZdBofRPG-zOow8f3Aj0qehCk,20517
+OpenFisca_France-168.0.0.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+OpenFisca_France-168.0.0.dist-info/top_level.txt,sha256=hmd7WhmLN_CyB52sP702pN9WlJqO9YMVuzeBRNp3hfs,23
+OpenFisca_France-168.0.0.dist-info/RECORD,,

openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/activite.py

@@ -114,6 +114,7 @@ class csg_deductible_salaire(Variable):
         montant_csg = montant_csg_crds(
             base_avec_abattement = assiette_csg_abattue,
             base_sans_abattement = assiette_csg_non_abattue,
+            abattement_parameter = csg.activite.abattement,
             law_node = csg.activite.deductible,
             plafond_securite_sociale = plafond_securite_sociale,
             )
@@ -132,12 +133,13 @@ class csg_imposable_salaire(Variable):
         assiette_csg_abattue = individu('assiette_csg_abattue', period)
         assiette_csg_non_abattue = individu('assiette_csg_non_abattue', period)
         plafond_securite_sociale = individu('plafond_securite_sociale', period)
-        parameters = parameters(period)
+        csg_parameters = parameters(period).prelevements_sociaux.contributions_sociales.csg
 
         montant_csg = montant_csg_crds(
             base_avec_abattement = assiette_csg_abattue,
             base_sans_abattement = assiette_csg_non_abattue,
-            law_node = parameters.prelevements_sociaux.contributions_sociales.csg.activite.imposable,
+            abattement_parameter = csg_parameters.activite.abattement,
+            law_node = csg_parameters.activite.imposable,
             plafond_securite_sociale = plafond_securite_sociale,
             )
 
@@ -160,9 +162,10 @@ class crds_salaire(Variable):
         law = parameters(period)
 
         montant_crds = montant_csg_crds(
-            law_node = law.prelevements_sociaux.contributions_sociales.crds.activite,
+            law_node = law.prelevements_sociaux.contributions_sociales.crds,
             base_avec_abattement = assiette_csg_abattue,
             base_sans_abattement = assiette_csg_non_abattue,
+            abattement_parameter = law.prelevements_sociaux.contributions_sociales.csg.activite.abattement,
             plafond_securite_sociale = plafond_securite_sociale,
             )
 
@@ -446,7 +449,7 @@ class crds_non_salarie(Variable):
 
     def formula(individu, period, parameters):
         assiette_csg_crds_non_salarie = individu('assiette_csg_crds_non_salarie', period)
-        taux = parameters(period).prelevements_sociaux.contributions_sociales.crds.activite.taux
+        taux = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux
         return - taux * assiette_csg_crds_non_salarie
 
 

openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/base.py

@@ -1,7 +1,7 @@
 
 
 def montant_csg_crds(base_avec_abattement = None, base_sans_abattement = None, indicatrice_taux_plein = None,
-        indicatrice_taux_reduit = None, law_node = None, plafond_securite_sociale = None):
+        indicatrice_taux_intermediaire = None, indicatrice_taux_reduit = None, abattement_parameter = None, law_node = None, plafond_securite_sociale = None):
     assert law_node is not None
     assert plafond_securite_sociale is not None
     if base_sans_abattement is None:
@@ -9,12 +9,25 @@ def montant_csg_crds(base_avec_abattement = None, base_sans_abattement = None, i
     if base_avec_abattement is None:
         base = base_sans_abattement
     else:
-        base = base_avec_abattement - law_node.abattement.calc(
+        assert abattement_parameter is not None
+        base = base_avec_abattement - abattement_parameter.calc(
             base_avec_abattement,
             factor = plafond_securite_sociale,
             round_base_decimals = 2,
             ) + base_sans_abattement
-    if indicatrice_taux_plein is None and indicatrice_taux_reduit is None:
+    if indicatrice_taux_plein is None and indicatrice_taux_reduit is None and indicatrice_taux_intermediaire is None:
         return -law_node.taux * base
+    elif indicatrice_taux_plein is not None and indicatrice_taux_reduit is not None and indicatrice_taux_intermediaire is None:
+        return - (
+            law_node.taux_plein * indicatrice_taux_plein
+            + law_node.taux_reduit * indicatrice_taux_reduit
+            ) * base
     else:
-        return - (law_node.taux_plein * indicatrice_taux_plein + law_node.taux_reduit * indicatrice_taux_reduit) * base
+        assert indicatrice_taux_plein is not None
+        assert indicatrice_taux_reduit is not None
+        assert indicatrice_taux_intermediaire is not None
+        return - (
+            law_node.taux_plein * indicatrice_taux_plein
+            + law_node.taux_reduit * indicatrice_taux_reduit
+            + law_node.taux_median * indicatrice_taux_intermediaire
+            ) * base

openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/capital.py

@@ -333,7 +333,7 @@ class crds_glo_assimile_salaire_ir_et_ps(Variable):
     def formula(individu, period, parameters):
         f1tt = individu('f1tt', period)
         return - f1tt * (
-            parameters(period).prelevements_sociaux.contributions_sociales.crds.activite.taux
+            parameters(period).prelevements_sociaux.contributions_sociales.crds.taux
             )
 
 

openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/remplacement.py

@@ -24,53 +24,6 @@ class TypesTauxCSGRetraite(Enum):
     taux_plein = 'Taux plein'
 
 
-def montant_csg_crds_2_taux(base_avec_abattement = None, base_sans_abattement = None, indicatrice_taux_plein = None,
-        indicatrice_taux_reduit = None, law_node = None, plafond_securite_sociale = None):
-    assert law_node is not None
-    assert plafond_securite_sociale is not None
-    if base_sans_abattement is None:
-        base_sans_abattement = 0
-    if base_avec_abattement is None:
-        base = base_sans_abattement
-    else:
-        base = base_avec_abattement - law_node.abattement.calc(
-            base_avec_abattement,
-            factor = plafond_securite_sociale,
-            round_base_decimals = 2,
-            ) + base_sans_abattement
-    if indicatrice_taux_plein is None and indicatrice_taux_reduit is None:
-        return -law_node.taux * base
-    else:
-        return - (
-            law_node.taux_plein * indicatrice_taux_plein
-            + law_node.taux_reduit * indicatrice_taux_reduit
-            ) * base
-
-
-def montant_csg_crds_3_taux(base_avec_abattement = None, base_sans_abattement = None, indicatrice_taux_plein = None,
-        indicatrice_taux_reduit = None, indicatrice_taux_intermediaire = None, law_node = None, plafond_securite_sociale = None):
-    assert law_node is not None
-    assert plafond_securite_sociale is not None
-    if base_sans_abattement is None:
-        base_sans_abattement = 0
-    if base_avec_abattement is None:
-        base = base_sans_abattement
-    else:
-        base = base_avec_abattement - law_node.abattement.calc(
-            base_avec_abattement,
-            factor = plafond_securite_sociale,
-            round_base_decimals = 2,
-            ) + base_sans_abattement
-    if indicatrice_taux_plein is None and indicatrice_taux_reduit is None and indicatrice_taux_intermediaire is None:
-        return -law_node.taux * base
-    else:
-        return - (
-            law_node.taux_plein * indicatrice_taux_plein
-            + law_node.taux_reduit * indicatrice_taux_reduit
-            + law_node.taux_median * indicatrice_taux_intermediaire
-            ) * base
-
-
 # Allocations chômage
 
 class assiette_csg_crds_chomage_journaliere(Variable):
@@ -125,6 +78,7 @@ class csg_deductible_chomage(Variable):
             base_avec_abattement = assiette_csg_chomage,
             indicatrice_taux_plein = (taux_csg_remplacement == TypesTauxCSGRemplacement.taux_plein),
             indicatrice_taux_reduit = (taux_csg_remplacement == TypesTauxCSGRemplacement.taux_reduit),
+            abattement_parameter = parameters.prelevements_sociaux.contributions_sociales.csg.activite.abattement,
             law_node = parameters.prelevements_sociaux.contributions_sociales.csg.remplacement.allocations_chomage.deductible,
             plafond_securite_sociale = parameters.prelevements_sociaux.pss.plafond_securite_sociale_mensuel,
             )
@@ -190,6 +144,7 @@ class csg_imposable_chomage(Variable):
             base_avec_abattement = assiette_csg_chomage,
             indicatrice_taux_plein = (taux_csg_remplacement == TypesTauxCSGRemplacement.taux_plein),
             indicatrice_taux_reduit = (taux_csg_remplacement == TypesTauxCSGRemplacement.taux_reduit),
+            abattement_parameter = parameters.prelevements_sociaux.contributions_sociales.csg.activite.abattement,
             law_node = parameters.prelevements_sociaux.contributions_sociales.csg.remplacement.allocations_chomage.imposable,
             plafond_securite_sociale = parameters.prelevements_sociaux.pss.plafond_securite_sociale_mensuel,
             )
@@ -256,7 +211,8 @@ class crds_chomage(Variable):
             )
         montant_crds = montant_csg_crds(
             base_avec_abattement = assiette_crds_chomage,
-            law_node = parameters.prelevements_sociaux.contributions_sociales.crds.activite,
+            abattement_parameter = parameters.prelevements_sociaux.contributions_sociales.csg.activite.abattement,
+            law_node = parameters.prelevements_sociaux.contributions_sociales.crds,
             plafond_securite_sociale = parameters.prelevements_sociaux.pss.plafond_securite_sociale_mensuel,
             ) * eligible
 
@@ -341,7 +297,7 @@ class csg_deductible_retraite(Variable):
             [TypesTauxCSGRetraite.exonere, TypesTauxCSGRetraite.taux_reduit, TypesTauxCSGRetraite.taux_intermediaire, TypesTauxCSGRetraite.taux_plein]
             )
 
-        montant_csg = montant_csg_crds_3_taux(
+        montant_csg = montant_csg_crds(
             base_sans_abattement = retraite_brute,
             indicatrice_taux_plein = (taux_csg_retraite == TypesTauxCSGRetraite.taux_plein),
             indicatrice_taux_reduit = (taux_csg_retraite == TypesTauxCSGRetraite.taux_reduit),
@@ -365,7 +321,7 @@ class csg_deductible_retraite(Variable):
             [TypesTauxCSGRetraite.exonere, TypesTauxCSGRetraite.taux_reduit, TypesTauxCSGRetraite.taux_plein]
             )
 
-        montant_csg = montant_csg_crds_2_taux(
+        montant_csg = montant_csg_crds(
             base_sans_abattement = retraite_brute,
             indicatrice_taux_plein = (taux_csg_retraite == TypesTauxCSGRetraite.taux_plein),
             indicatrice_taux_reduit = (taux_csg_retraite == TypesTauxCSGRetraite.taux_reduit),
@@ -407,7 +363,7 @@ class csg_imposable_retraite(Variable):
             [TypesTauxCSGRetraite.exonere, TypesTauxCSGRetraite.taux_reduit, TypesTauxCSGRetraite.taux_intermediaire, TypesTauxCSGRetraite.taux_plein]
             )
 
-        montant_csg = montant_csg_crds_3_taux(
+        montant_csg = montant_csg_crds(
             base_sans_abattement = retraite_brute,
             indicatrice_taux_plein = (taux_csg_retraite == TypesTauxCSGRetraite.taux_plein),
             indicatrice_taux_reduit = (taux_csg_retraite == TypesTauxCSGRetraite.taux_reduit),
@@ -431,7 +387,7 @@ class csg_imposable_retraite(Variable):
             [TypesTauxCSGRetraite.exonere, TypesTauxCSGRetraite.taux_reduit, TypesTauxCSGRetraite.taux_plein]
             )
 
-        montant_csg = montant_csg_crds_2_taux(
+        montant_csg = montant_csg_crds(
             base_sans_abattement = retraite_brute,
             indicatrice_taux_plein = (taux_csg_retraite == TypesTauxCSGRetraite.taux_plein),
             indicatrice_taux_reduit = (taux_csg_retraite == TypesTauxCSGRetraite.taux_reduit),
@@ -475,7 +431,7 @@ class crds_retraite(Variable):
 
         montant_crds = montant_csg_crds(
             base_sans_abattement = retraite_brute,
-            law_node = parameters.prelevements_sociaux.contributions_sociales.crds.retraite,
+            law_node = parameters.prelevements_sociaux.contributions_sociales.crds,
             plafond_securite_sociale = parameters.prelevements_sociaux.pss.plafond_securite_sociale_mensuel,
             ) * (taux_csg_retraite != TypesTauxCSGRetraite.exonere)
 
@@ -497,7 +453,7 @@ class crds_retraite(Variable):
 
         montant_crds = montant_csg_crds(
             base_sans_abattement = retraite_brute,
-            law_node = parameters.prelevements_sociaux.contributions_sociales.crds.retraite,
+            law_node = parameters.prelevements_sociaux.contributions_sociales.crds,
             plafond_securite_sociale = parameters.prelevements_sociaux.pss.plafond_securite_sociale_mensuel,
             ) * (taux_csg_retraite != TypesTauxCSGRetraite.exonere)
         return montant_crds
@@ -505,7 +461,7 @@ class crds_retraite(Variable):
     def formula(individu, period, parameters):  # formula_1997_2014 à corriger (cf. commentaire au niveau de la variable)
         retraite_brute = individu('retraite_brute', period)
         parameters = parameters(period)
-        taux = parameters.prelevements_sociaux.contributions_sociales.crds.retraite.taux
+        taux = parameters.prelevements_sociaux.contributions_sociales.crds.taux
 
         return - taux * retraite_brute
 

openfisca_france/model/prestations/aides_logement.py

@@ -1410,7 +1410,7 @@ class crds_logement(Variable):
 
     def formula(famille, period, parameters):
         aide_logement_montant_brut = famille('aide_logement_montant_brut_crds', period)
-        crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux_global
+        crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux
         return -aide_logement_montant_brut * crds
 
 

openfisca_france/model/prestations/complement_are.py

@@ -247,7 +247,7 @@ class complement_are_csg_journaliere(Variable):
         assiette_mensuelle_csg_abattable = min_(assiette_mensuelle_csg, max_assiette_mensuelle_eligible_abattement)
         assiette_mensuelle_csg_non_abattue = max_(assiette_mensuelle_csg - max_assiette_mensuelle_eligible_abattement, 0)
 
-        abattement_assiette_csg = parametres_csg_chomage.imposable.abattement.rates[0]
+        abattement_assiette_csg = parameters(period).prelevements_sociaux.contributions_sociales.csg.activite.abattement.rates[0]
         assiette_journaliere_csg = (
             (assiette_mensuelle_csg_abattable * (1 - abattement_assiette_csg)) + assiette_mensuelle_csg_non_abattue
             ) / complement_are_nombre_jours_indemnisables
@@ -308,7 +308,7 @@ class complement_are_crds_journaliere(Variable):
         assiette_mensuelle_crds = allocation_journaliere_brute_are * complement_are_nombre_jours_indemnisables
 
         abattement_assiette_mensuelle_crds = (
-            parametres_prelevements_sociaux.contributions_sociales.crds.activite.abattement.calc(
+            parametres_prelevements_sociaux.contributions_sociales.csg.activite.abattement.calc(
                 assiette_mensuelle_crds,
                 factor = parametres_prelevements_sociaux.pss.plafond_securite_sociale_mensuel
                 )
@@ -317,7 +317,7 @@ class complement_are_crds_journaliere(Variable):
 
         # taux global par défaut : au demandeur d'emploi de suivre une démarche
         # pour la prise en compte du RFR (exonération potentielle de CRDS)
-        taux_global_crds_chomage = parametres_prelevements_sociaux.contributions_sociales.crds.taux_global
+        taux_global_crds_chomage = parametres_prelevements_sociaux.contributions_sociales.crds.taux
         crds_theorique = assiette_journaliere_crds * taux_global_crds_chomage
 
         # après la CSG, la CRDS ne doit pas faire baisser le montant net de l'allocation en-dessous du smic brut

openfisca_france/model/prestations/minima_sociaux/anciens_ms.py

@@ -183,7 +183,7 @@ class crds_rsa_activite(Variable):
 
     def formula_2009_06_01(famille, period, parameters):
         rsa_activite = famille('rsa_activite', period)
-        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux_global
+        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux
 
         return - taux_crds * rsa_activite
 

openfisca_france/model/prestations/minima_sociaux/ppa.py

@@ -522,7 +522,7 @@ class crds_ppa(Variable):
 
     def formula_2016_01_01(famille, period, parameters):
         ppa = famille('ppa', period)
-        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux_global
+        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux
 
         return - taux_crds * ppa
 

openfisca_france/model/prestations/prestations_familiales/af.py

@@ -437,7 +437,7 @@ class crds_af(Variable):
     def formula(famille, period, parameters):
         af = famille('af', period)
 
-        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux_global
+        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux
 
         return -(af) * taux_crds
 

openfisca_france/model/prestations/prestations_familiales/ars.py

@@ -74,7 +74,7 @@ class crds_ars(Variable):
     def formula(famille, period, parameters):
         ars = famille('ars', period)
 
-        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux_global
+        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux
 
         return -(ars) * taux_crds
 

openfisca_france/model/prestations/prestations_familiales/asf.py

@@ -90,7 +90,7 @@ class crds_asf(Variable):
     def formula(famille, period, parameters):
         asf = famille('asf', period)
 
-        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux_global
+        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux
 
         return -(asf) * taux_crds
 

openfisca_france/model/prestations/prestations_familiales/cf.py

@@ -353,7 +353,7 @@ class crds_cf(Variable):
     def formula(famille, period, parameters):
         cf = famille('cf', period)
 
-        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux_global
+        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux
 
         return -(cf) * taux_crds
 

openfisca_france/model/prestations/prestations_familiales/paje.py

@@ -763,7 +763,7 @@ class crds_ape(Variable):
     def formula(famille, period, parameters):
         ape = famille('ape', period)
 
-        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux_global
+        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux
 
         return -(ape) * taux_crds
 
@@ -811,7 +811,7 @@ class crds_apje(Variable):
     def formula(famille, period, parameters):
         apje = famille('apje', period)
 
-        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux_global
+        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux
 
         return -(apje) * taux_crds
 
@@ -988,7 +988,7 @@ class crds_paje(Variable):
     def formula(famille, period, parameters):
         paje = famille('paje', period)
 
-        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux_global
+        taux_crds = parameters(period).prelevements_sociaux.contributions_sociales.crds.taux
 
         return -(paje) * taux_crds