From d029238f4b1580df28d2b2d317c296a824889bdc Mon Sep 17 00:00:00 2001 From: cgl Date: Fri, 1 Sep 2023 16:29:56 +0200 Subject: [PATCH 1/8] =?UTF-8?q?Ajoute=20des=20agr=C3=A9gats=20pour=20la=20?= =?UTF-8?q?France=20enti=C3=A8re=20pour=20les=20ann=C3=A9es=20r=C3=A9cente?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../france_entiere_2019.json" | 179 +++++++++++++++++ .../france_entiere_2020.json" | 179 +++++++++++++++++ .../france_entiere_2021.json" | 176 +++++++++++++++++ .../france_entiere_2022.json" | 179 +++++++++++++++++ .../france_entiere_2023.json" | 173 ++++++++++++++++ .../france_entiere_template.json" | 184 ++++++++++++++++++ .../assets/aggregats/ines/ines_2019.json | 6 +- .../assets/aggregats/ines/ines_2020.json | 158 +++++++++++++++ 8 files changed, 1231 insertions(+), 3 deletions(-) create mode 100644 "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2019.json" create mode 100644 "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2020.json" create mode 100644 "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2021.json" create mode 100644 "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2022.json" create mode 100644 "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2023.json" create mode 100644 "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_template.json" create mode 100644 openfisca_france_data/assets/aggregats/ines/ines_2020.json diff --git "a/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2019.json" "b/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2019.json" new file mode 100644 index 00000000..f8d7fb14 --- /dev/null +++ "b/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2019.json" @@ -0,0 +1,179 @@ +{ + "documentation":"", + "data":[ + { + "variable":"salaire_imposable", + "actual_beneficiaries": 24918000, + "actual_amount": 743500000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)", + "note": "salaire et chomage" + }, + { + "variable":"chomage_imposable", + "actual_beneficiaries": 24918000, + "actual_amount": 743500000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)", + "note": "salaire et chomage" + }, + { + "variable":"retraite_imposable", + "actual_beneficiaries": 14768000, + "actual_amount": 327344000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"rpns_imposables", + "actual_beneficiaries": 3189000, + "actual_amount": 77837000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"revenu_categoriel_foncier", + "actual_beneficiaries": 5019000, + "actual_amount": 28242000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"revenu_categoriel_capital", + "actual_beneficiaries": 15235000, + "actual_amount": 356330000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"revenu_categoriel_plus_values", + "actual_beneficiaries": 1600000, + "actual_amount": 18812000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"af", + "actual_beneficiaries": 5101000, + "actual_amount": 12719000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + + }, + { + "variable":"paje_prepare", + "actual_beneficiaries": 273000, + "actual_amount": 922000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"aeeh", + "actual_beneficiaries": 321000, + "actual_amount": 1060000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"asf", + "actual_beneficiaries": 803000, + "actual_amount": 1771000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"paje_base", + "actual_beneficiaries": 1619000, + "actual_amount": 3374000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"paje_naissance", + "actual_beneficiaries": 46400000, + "actual_amount": 553000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"cf", + "actual_beneficiaries": 871000, + "actual_amount":2331000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"ars", + "actual_beneficiaries": 3132000, + "actual_amount": 2034000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"paje_cmg", + "actual_beneficiaries": 910000, + "actual_amount":6329000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"aides_logement", + "actual_beneficiaries": 0, + "actual_amount": 16270006022, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2020, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/2020_Rapport%20du%20Dcf%20sur%20les%20comptes.pdf)" + }, + { + "variable":"apl", + "actual_beneficiaries": 7385478511, + "actual_amount": 16270006022, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2020, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/2020_Rapport%20du%20Dcf%20sur%20les%20comptes.pdf)" + }, + { + "variable":"aah", + "actual_beneficiaries": 0, + "actual_amount":10370937843, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2020, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/2020_Rapport%20du%20Dcf%20sur%20les%20comptes.pdf)" + }, + { + "variable":"aspa", + "actual_beneficiaries":0, + "actual_amount": 0 + }, + { + "variable":"asi", + "actual_beneficiaries":0, + "actual_amount":0 + }, + { + "variable":"rsa", + "actual_beneficiaries": 0, + "actual_amount":10927045125, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2020, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/2020_Rapport%20du%20Dcf%20sur%20les%20comptes.pdf)" + }, + { + "variable":"ppa", + "actual_beneficiaries": 0, + "actual_amount": 9374056880, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2020, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/2020_Rapport%20du%20Dcf%20sur%20les%20comptes.pdf)" + }, + { + "variable":"csg_salaire", + "actual_beneficiaries": 0, + "actual_amount": 75706000000, + "source": "Comptes de la sécurité sociale, résultats 2019 et prévision 2020 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/CCSS/2020/RAPPORT%20CCSS%20JUIN%202020.pdf)" + }, + { + "variable":"csg_non_salarie", + "actual_beneficiaries": 0, + "actual_amount": 14098000000, + "source": "Comptes de la sécurité sociale, résultats 2019 et prévision 2020 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/CCSS/2020/RAPPORT%20CCSS%20JUIN%202020.pdf)" + }, + { + "variable":"csg_retraite", + "actual_beneficiaries":0, + "actual_amount":20799000000, + "source": "Comptes de la sécurité sociale, résultats 2019 et prévision 2020 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/CCSS/2020/RAPPORT%20CCSS%20JUIN%202020.pdf)" + }, + { + "variable":"csg_chomage", + "actual_beneficiaries":0, + "actual_amount":577000000, + "source": "Comptes de la sécurité sociale, résultats 2019 et prévision 2020 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/CCSS/2020/RAPPORT%20CCSS%20JUIN%202020.pdf)" + }, + { + "variable":"irpp", + "actual_beneficiaries":39332000, + "actual_amount":76911000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition par région (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"ifi", + "actual_beneficiaries":0, + "actual_amount":0 + } + ] +} \ No newline at end of file diff --git "a/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2020.json" "b/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2020.json" new file mode 100644 index 00000000..619edb0c --- /dev/null +++ "b/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2020.json" @@ -0,0 +1,179 @@ +{ + "documentation":"Pour les prestations sociales, les cotisations et prélèvements sociaux, note de validation INES 2019, pour l'ir note de validation 2019 et 2020", + "data":[ + { + "variable":"salaire_imposable", + "actual_beneficiaries": 25236000, + "actual_amount": 758742000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)", + "note": "salaire et chomage" + }, + { + "variable":"chomage_imposable", + "actual_beneficiaries": 25236000, + "actual_amount": 758742000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)", + "note": "salaire et chomage" + }, + { + "variable":"retraite_imposable", + "actual_beneficiaries": 14862000, + "actual_amount": 335220000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"rpns_imposables", + "actual_beneficiaries": 3275000, + "actual_amount": 75284000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"revenu_categoriel_foncier", + "actual_beneficiaries": 5045000, + "actual_amount": 27152000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"revenu_categoriel_capital", + "actual_beneficiaries": 14701000, + "actual_amount": 34590000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"revenu_categoriel_plus_values", + "actual_beneficiaries": 1600000, + "actual_amount": 16559000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"af", + "actual_beneficiaries": 5091000, + "actual_amount": 12719000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"paje_prepare", + "actual_beneficiaries": 255000, + "actual_amount": 868000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"aeeh", + "actual_beneficiaries": 346000, + "actual_amount": 1162000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"asf", + "actual_beneficiaries": 813000, + "actual_amount": 1794000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"paje_base", + "actual_beneficiaries": 1555000, + "actual_amount": 3140000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"paje_naissance", + "actual_beneficiaries": 44900, + "actual_amount": 542000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"cf", + "actual_beneficiaries": 872000, + "actual_amount":2349000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"ars", + "actual_beneficiaries": 3132000, + "actual_amount": 2576000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"paje_cmg", + "actual_beneficiaries": 845000, + "actual_amount":6381000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"aides_logement", + "actual_beneficiaries": 16320024194, + "actual_amount": 0, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2021, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/Comptes-et-financements/2021/Rapport_Dcf_comptes_exercice2021.pdf)" + }, + { + "variable":"apl", + "actual_beneficiaries": 7120293737, + "actual_amount": 0, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2021, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/Comptes-et-financements/2021/Rapport_Dcf_comptes_exercice2021.pdf)" + }, + { + "variable":"aah", + "actual_beneficiaries": 0, + "actual_amount":11093058684, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2021, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/Comptes-et-financements/2021/Rapport_Dcf_comptes_exercice2021.pdf)" + }, + { + "variable":"aspa", + "actual_beneficiaries":635000, + "actual_amount": 3530000000, + "source":"CCSS éclairage Juillet 2022 L'ASPA et le minimum vieillesse (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/CCSS/2022/Fiches%20%c3%a9clairages%20-%20Juillet%202022/CCSS-Fiche%20eclairage-Juillet%202022-L%e2%80%99allocation%20de%20solidarit%c3%a9%20aux%20personnes%20%c3%a2g%c3%a9es%20(Aspa)%20et%20le%20minimum%20vieillesse.pdf)" + }, + { + "variable":"asi", + "actual_beneficiaries":0, + "actual_amount":0 + }, + { + "variable":"rsa", + "actual_beneficiaries":11205404082, + "actual_amount":0, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2021, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/Comptes-et-financements/2021/Rapport_Dcf_comptes_exercice2021.pdf)" + }, + { + "variable":"ppa", + "actual_beneficiaries": 0, + "actual_amount": 9592354920, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2021, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/Comptes-et-financements/2021/Rapport_Dcf_comptes_exercice2021.pdf)" + }, + { + "variable":"csg_salaire", + "actual_beneficiaries": 0, + "actual_amount": 72628000000, + "source": "Comptes de la sécurité sociale, résultats 2020, prévisions 2021 et 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/CCSS/2021/Rapport%20CCSS-Septembre2021.pdf)" + }, + { + "variable":"csg_non_salarie", + "actual_beneficiaries": 0, + "actual_amount": 11771000000, + "source": "Comptes de la sécurité sociale, résultats 2020, prévisions 2021 et 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/CCSS/2021/Rapport%20CCSS-Septembre2021.pdf)" + }, + { + "variable":"csg_retraite", + "actual_beneficiaries":0, + "actual_amount":20944000000, + "source": "Comptes de la sécurité sociale, résultats 2020, prévisions 2021 et 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/CCSS/2021/Rapport%20CCSS-Septembre2021.pdf)" + }, + { + "variable":"csg_chomage", + "actual_beneficiaries":0, + "actual_amount":1623000000, + "source": "Comptes de la sécurité sociale, résultats 2020, prévisions 2021 et 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/CCSS/2021/Rapport%20CCSS-Septembre2021.pdf)" + }, + { + "variable":"irpp", + "actual_beneficiaries":39888000, + "actual_amount":73979000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition par région (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"ifi", + "actual_beneficiaries":0, + "actual_amount":0 + } + ] +} \ No newline at end of file diff --git "a/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2021.json" "b/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2021.json" new file mode 100644 index 00000000..4440b74a --- /dev/null +++ "b/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2021.json" @@ -0,0 +1,176 @@ +{ + "documentation":"Pour les prestations sociales, les cotisations et prélèvements sociaux, note de validation INES 2019, pour l'ir note de validation 2019 et 2020", + "data":[ + { + "variable":"salaire_imposable", + "actual_beneficiaries": 23622000, + "actual_amount": 685645000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"chomage_imposable", + "actual_beneficiaries": 5601000, + "actual_amount": 37876000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"retraite_imposable", + "actual_beneficiaries": 14967000, + "actual_amount": 341810000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"rpns_imposables", + "actual_beneficiaries": 3476000, + "actual_amount": 85747000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"revenu_categoriel_foncier", + "actual_beneficiaries": 5045000, + "actual_amount": 30261000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"revenu_categoriel_capital", + "actual_beneficiaries": 15511000, + "actual_amount": 45881000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"revenu_categoriel_plus_values", + "actual_beneficiaries": 216000, + "actual_amount": 216000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition des revenus catégoriels déclarés entre imposés et non-imposés (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"af", + "actual_beneficiaries": 0, + "actual_amount": 12660000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"paje_prepare", + "actual_beneficiaries": 0, + "actual_amount": 770000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"aeeh", + "actual_beneficiaries": 0, + "actual_amount": 1225000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"asf", + "actual_beneficiaries": 0, + "actual_amount": 174000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"paje_base", + "actual_beneficiaries": 0, + "actual_amount": 2986000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"paje_naissance", + "actual_beneficiaries": 0, + "actual_amount": 729000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"cf", + "actual_beneficiaries": 0, + "actual_amount":2361000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"ars", + "actual_beneficiaries": 0, + "actual_amount": 2047000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"paje_cmg", + "actual_beneficiaries": 0, + "actual_amount":5909000000, + "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" + }, + { + "variable":"aides_logement", + "actual_beneficiaries": 0, + "actual_amount": 15262994463, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2021, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/Comptes-et-financements/2021/Rapport_Dcf_comptes_exercice2021.pdf)" + }, + { + "variable":"aah", + "actual_beneficiaries": 0, + "actual_amount":11222712959, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2021, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/Comptes-et-financements/2021/Rapport_Dcf_comptes_exercice2021.pdf)" + }, + { + "variable":"apl", + "actual_beneficiaries": 6743703175, + "actual_amount": 0, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2021, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/Comptes-et-financements/2021/Rapport_Dcf_comptes_exercice2021.pdf)" + }, + { + "variable":"aspa", + "actual_beneficiaries":0, + "actual_amount": 0 + }, + { + "variable":"asi", + "actual_beneficiaries":0, + "actual_amount":0 + }, + { + "variable":"rsa", + "actual_beneficiaries": 0, + "actual_amount":10849396420, + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2021, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/Comptes-et-financements/2021/Rapport_Dcf_comptes_exercice2021.pdf)" + }, + { + "variable":"ppa", + "actual_beneficiaries": 0, + "actual_amount": 9468691928 , + "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2021, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/Comptes-et-financements/2021/Rapport_Dcf_comptes_exercice2021.pdf)" + }, + { + "variable":"csg_salaire", + "actual_beneficiaries": 0, + "actual_amount": 78091000000, + "source": "Comptes de la sécurité sociale, résultats 2022 et prévisions 2023 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2023/CCSS-Mai2023.pdf)" + }, + { + "variable":"csg_non_salarie", + "actual_beneficiaries": 0, + "actual_amount": 14527000000, + "source": "Comptes de la sécurité sociale, résultats 2022 et prévisions 2023 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2023/CCSS-Mai2023.pdf)" + }, + { + "variable":"csg_retraite", + "actual_beneficiaries":0, + "actual_amount":21414000000, + "source":"Comptes de la sécurité sociale, résultats 2022 et prévisions 2023 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2023/CCSS-Mai2023.pdf)" + }, + { + "variable":"csg_chomage", + "actual_beneficiaries":0, + "actual_amount":973000000, + "source":"Comptes de la sécurité sociale, résultats 2022 et prévisions 2023 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2023/CCSS-Mai2023.pdf)" + }, + { + "variable":"irpp", + "actual_beneficiaries":40257000, + "actual_amount":80826000000, + "source": "Statistiques DGFIP, Impôt sur le revenu : répartition par région (https://www.impots.gouv.fr/statistiques-impots-des-particuliers)" + }, + { + "variable":"ifi", + "actual_beneficiaries":0, + "actual_amount":0 + } + ] +} \ No newline at end of file diff --git "a/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2022.json" "b/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2022.json" new file mode 100644 index 00000000..9bf93e25 --- /dev/null +++ "b/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2022.json" @@ -0,0 +1,179 @@ +{ + "documentation":"", + "data":[ + { + "variable":"salaire_imposable", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"chomage_imposable", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"retraite_imposable", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"rpns_imposables", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"revenu_categoriel_foncier", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"revenu_categoriel_capital", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"revenu_categoriel_plus_values", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"af", + "actual_beneficiaries": 0, + "actual_amount": 13038682622, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"paje_prepare", + "actual_beneficiaries": 0, + "actual_amount": 757550577, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"aeeh", + "actual_beneficiaries": 0, + "actual_amount": 1311533249, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"asf", + "actual_beneficiaries": 0, + "actual_amount": 2012315236, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"paje_base", + "actual_beneficiaries": 0, + "actual_amount": 3004670266, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"paje_naissance", + "actual_beneficiaries": 0, + "actual_amount": 535273024, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"cf", + "actual_beneficiaries": 0, + "actual_amount": 2401233483, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"ars", + "actual_beneficiaries": 0, + "actual_amount": 2131128426, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"paje_cmg", + "actual_beneficiaries": 0, + "actual_amount": 6756309799, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"aides_logement", + "actual_beneficiaries": 0, + "actual_amount": 15075235808, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"apl", + "actual_beneficiaries": 0, + "actual_amount": 6693675898, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"aah", + "actual_beneficiaries": 0, + "actual_amount": 11937472725, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"aspa", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"asi", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"rsa", + "actual_beneficiaries": 0, + "actual_amount": 9914084209, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"ppa", + "actual_beneficiaries": 0, + "actual_amount": 9655667966, + "source": "Le rapport du Directeur comptable et financier de la CNAF, exercice 2022(https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/Textes%20de%20r%C3%A9f%C3%A9rence/comptes%20et%20financements/Point%203%20Rapport%20du%20Dcf%20sur%20les%20comptes%202022.pdf)" + }, + { + "variable":"csg_salaire", + "actual_beneficiaries": 0, + "actual_amount": 84090000000, + "source": "Comptes de la sécurité sociale, résultats 2022 et prévisions 2023 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2023/CCSS-Mai2023.pdf)" + }, + { + "variable":"csg_non_salarie", + "actual_beneficiaries": 0, + "actual_amount": 16102000000, + "source": "Comptes de la sécurité sociale, résultats 2022 et prévisions 2023 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2023/CCSS-Mai2023.pdf)" + }, + { + "variable":"csg_retraite", + "actual_beneficiaries":0, + "actual_amount":22639000000, + "source":"Comptes de la sécurité sociale, résultats 2022 et prévisions 2023 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2023/CCSS-Mai2023.pdf)" + }, + { + "variable":"csg_chomage", + "actual_beneficiaries":0, + "actual_amount":576000000, + "source":"Comptes de la sécurité sociale, résultats 2022 et prévisions 2023 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2023/CCSS-Mai2023.pdf)" + }, + { + "variable":"irpp", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"ifi", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + } + ] +} \ No newline at end of file diff --git "a/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2023.json" "b/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2023.json" new file mode 100644 index 00000000..c66ec02a --- /dev/null +++ "b/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2023.json" @@ -0,0 +1,173 @@ +{ + "documentation":"", + "data":[ + { + "variable":"salaire_imposable", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"chomage_imposable", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"retraite_imposable", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"rpns_imposables", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"revenu_categoriel_foncier", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"revenu_categoriel_capital", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"revenu_categoriel_plus_values", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"af", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"paje_prepare", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"aeeh", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"asf", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"paje_base", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"paje_naissance", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"cf", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"ars", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"paje_cmg", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"aides_logement", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"aah", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"aspa", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"asi", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"rsa", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"ppa", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"csg_salaire", + "actual_beneficiaries": 0, + "actual_amount": 88313000000, + "source": "Comptes de la sécurité sociale, résultats 2022 et prévisions 2023 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2023/CCSS-Mai2023.pdf)" + }, + { + "variable":"csg_non_salarie", + "actual_beneficiaries": 0, + "actual_amount": 16292000000, + "source": "Comptes de la sécurité sociale, résultats 2022 et prévisions 2023 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2023/CCSS-Mai2023.pdf)" + }, + { + "variable":"csg_retraite", + "actual_beneficiaries":0, + "actual_amount":23600000000, + "source":"Comptes de la sécurité sociale, résultats 2022 et prévisions 2023 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2023/CCSS-Mai2023.pdf)" + }, + { + "variable":"csg_chomage", + "actual_beneficiaries":0, + "actual_amount":614000000, + "source":"Comptes de la sécurité sociale, résultats 2022 et prévisions 2023 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2023/CCSS-Mai2023.pdf)" + }, + { + "variable":"irpp", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"ifi", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + } + ] +} \ No newline at end of file diff --git "a/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_template.json" "b/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_template.json" new file mode 100644 index 00000000..d3e4da85 --- /dev/null +++ "b/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_template.json" @@ -0,0 +1,184 @@ +{ + "documentation":"", + "data":[ + { + "variable":"af", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"paje_prepare", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"aeeh", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"asf", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"paje_base", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"paje_naissance", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"cf", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"ars", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"paje_cmg", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"aides_logement", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"aah", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"aspa", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"asi", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"garantie_jeunes", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"rsa", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"ppa", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"cotisations_salariales", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"cotisations_non_salarie", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"cotisations_employeur", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"allegement_fillon", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"csg_salaire", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"csg_non_salarie", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"csg_remplacement", + "actual_beneficiaries":0, + "actual_amount":24017000000 + }, + { + "variable":"crds_salaire", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"crds_non_salarie", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"crds_remplacement", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"irpp", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"prelevement_forfaitaire_unique_ir", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"prelevement_forfaitaire_liberatoire", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + }, + { + "variable":"ifi", + "actual_beneficiaries": 0, + "actual_amount": 0, + "source": "" + } + ] +} \ No newline at end of file diff --git a/openfisca_france_data/assets/aggregats/ines/ines_2019.json b/openfisca_france_data/assets/aggregats/ines/ines_2019.json index e4fcd8b7..18a87b06 100644 --- a/openfisca_france_data/assets/aggregats/ines/ines_2019.json +++ b/openfisca_france_data/assets/aggregats/ines/ines_2019.json @@ -18,7 +18,7 @@ }, { "variable":"asf", - "actual_beneficiaries": 700000, + "actual_beneficiaries": 900000, "actual_amount": 1500000000 }, { @@ -43,7 +43,7 @@ }, { "variable":"paje_cmg", - "actual_beneficiaries": 1000000, + "actual_beneficiaries": 1200000, "actual_amount":6200000000 }, { @@ -54,7 +54,7 @@ { "variable":"aah", "actual_beneficiaries": 1100000, - "actual_amount":10400000000 + "actual_amount":8600000000 }, { "variable":"aspa", diff --git a/openfisca_france_data/assets/aggregats/ines/ines_2020.json b/openfisca_france_data/assets/aggregats/ines/ines_2020.json new file mode 100644 index 00000000..b18f7d82 --- /dev/null +++ b/openfisca_france_data/assets/aggregats/ines/ines_2020.json @@ -0,0 +1,158 @@ +{ + "documentation":"Pour les prestations sociales, les cotisations et prélèvements sociaux, note de validation INES 2020", + "data":[ + { + "variable":"af", + "actual_beneficiaries": 5100000, + "actual_amount": 12000000000 + }, + { + "variable":"paje_prepare", + "actual_beneficiaries": 400000, + "actual_amount": 80000000 + }, + { + "variable":"aeeh", + "actual_beneficiaries": 400000, + "actual_amount": 1000000000 + }, + { + "variable":"asf", + "actual_beneficiaries": 900000, + "actual_amount": 1500000000 + }, + { + "variable":"paje_base", + "actual_beneficiaries": 1900000, + "actual_amount": 2900000000 + }, + { + "variable":"paje_naissance", + "actual_beneficiaries": 500000, + "actual_amount": 500000 + }, + { + "variable":"cf", + "actual_beneficiaries": 1000000, + "actual_amount":2200000000 + }, + { + "variable":"ars", + "actual_beneficiaries": 2900000, + "actual_amount": 2400000000 + }, + { + "variable":"paje_cmg", + "actual_beneficiaries": 1100000, + "actual_amount":5800000000 + }, + { + "variable":"aides_logement", + "actual_beneficiaries": 6700000, + "actual_amount": 14000000000 + }, + { + "variable":"aah", + "actual_beneficiaries": 1100000, + "actual_amount":9200000000 + }, + { + "variable":"aspa", + "actual_beneficiaries":500000, + "actual_amount": 2800000000 + }, + { + "variable":"asi", + "actual_beneficiaries":100000, + "actual_amount":200000000 + }, + { + "variable":"garantie_jeunes", + "actual_beneficiaries": 200000, + "actual_amount":400000000 + }, + { + "variable":"rsa", + "actual_beneficiaries": 2000000, + "actual_amount":8600000000 + }, + { + "variable":"ppa", + "actual_beneficiaries": 5800000, + "actual_amount": 9200000000 + }, + { + "variable":"cotisations_salariales", + "actual_beneficiaries":0, + "actual_amount": 75600000000 + }, + { + "variable":"cotisations_non_salarie", + "actual_beneficiaries":0, + "actual_amount":19600000000 + }, + { + "variable":"cotisations_employeur", + "actual_beneficiaries":0, + "actual_amount":215000000000 + }, + { + "variable":"allegement_fillon", + "actual_beneficiaries":0, + "actual_amount":24700000000 + }, + { + "variable":"csg_salaire", + "actual_beneficiaries":0, + "actual_amount":72100000000 + }, + { + "variable":"csg_non_salarie", + "actual_beneficiaries":0, + "actual_amount":8700000000 + }, + { + "variable":"csg_remplacement", + "actual_beneficiaries":0, + "actual_amount":22600000000 + }, + { + "variable":"crds_salaire", + "actual_beneficiaries":0, + "actual_amount":3900000000 + }, + { + "variable":"crds_non_salarie", + "actual_beneficiaries":0, + "actual_amount":500000000 + }, + { + "variable":"crds_remplacement", + "actual_beneficiaries":0, + "actual_amount":19000000000 + }, + { + "variable":"irpp", + "actual_beneficiaries":0, + "actual_amount":0, + "notes":"somme de prélèvement à la source réalisés en 2019 sur revenus 2019 (note 2019) 69,2 + impot résiduel sur le revenu dû au titre des revenus 2019, net de crédits et réduction (note 2020) -8.1 sans prendre en compte le crédit d'impôt de prélèvement forfaitaire non libératoire de N-1 de 3,4 soit 3.4 - 8.1 + 69.2 " + }, + { + "variable":"prelevement_forfaitaire_unique_ir", + "actual_beneficiaries":0, + "actual_amount":0, + "notes":"prélèvement forfaitaire unique libératoire sur revenus 2019 (note 2020)" + }, + { + "variable":"prelevement_forfaitaire_liberatoire", + "actual_beneficiaries":0, + "actual_amount":0, + "notes":"prélèvement forfaitaire libératoire sur revenus 2019 (note 2019)" + }, + { + "variable":"ifi", + "actual_beneficiaries":0, + "actual_amount":0 + } + ] +} \ No newline at end of file From be0e129af7064f144c10ddfa5ca83ef05a8a4d64 Mon Sep 17 00:00:00 2001 From: cgl Date: Fri, 1 Sep 2023 16:44:41 +0200 Subject: [PATCH 2/8] renomme dossier --- .../assets/aggregats/france_entiere/france_entiere_2019.json | 0 .../assets/aggregats/france_entiere/france_entiere_2020.json | 0 .../assets/aggregats/france_entiere/france_entiere_2021.json | 0 .../assets/aggregats/france_entiere/france_entiere_2022.json | 0 .../assets/aggregats/france_entiere/france_entiere_2023.json | 0 .../assets/aggregats/france_entiere/france_entiere_template.json | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2019.json" => openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2019.json (100%) rename "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2020.json" => openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2020.json (100%) rename "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2021.json" => openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2021.json (100%) rename "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2022.json" => openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2022.json (100%) rename "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2023.json" => openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2023.json (100%) rename "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_template.json" => openfisca_france_data/assets/aggregats/france_entiere/france_entiere_template.json (100%) diff --git "a/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2019.json" b/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2019.json similarity index 100% rename from "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2019.json" rename to openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2019.json diff --git "a/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2020.json" b/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2020.json similarity index 100% rename from "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2020.json" rename to openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2020.json diff --git "a/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2021.json" b/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2021.json similarity index 100% rename from "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2021.json" rename to openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2021.json diff --git "a/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2022.json" b/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2022.json similarity index 100% rename from "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2022.json" rename to openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2022.json diff --git "a/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2023.json" b/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2023.json similarity index 100% rename from "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_2023.json" rename to openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2023.json diff --git "a/openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_template.json" b/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_template.json similarity index 100% rename from "openfisca_france_data/assets/aggregats/france_enti\303\250re/france_entiere_template.json" rename to openfisca_france_data/assets/aggregats/france_entiere/france_entiere_template.json From da06ff3b297d88cc1368c44a1b8d5f481590ecff Mon Sep 17 00:00:00 2001 From: cgl Date: Fri, 1 Sep 2023 16:44:54 +0200 Subject: [PATCH 3/8] ajoute france_enitre dans aggregates --- openfisca_france_data/aggregates.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/openfisca_france_data/aggregates.py b/openfisca_france_data/aggregates.py index 3d0bb7e8..dcfca474 100644 --- a/openfisca_france_data/aggregates.py +++ b/openfisca_france_data/aggregates.py @@ -107,4 +107,23 @@ def load_actual_data(self, year = None): result = result[["variable","actual_amount","actual_beneficiaries"]].set_index("variable") + elif target_source == "france_entiere": + ines_aggregates_file = Path( + pkg_resources.get_distribution("openfisca-france_data").location, + "openfisca_france_data", + "assets", + "aggregats", + "france_entiere", + f"france_entiere_{year}.json" + ) + + with open(ines_aggregates_file, 'r') as f: + data = json.load(f) + + result = pd.DataFrame(data['data']).drop(['source', 'notes'], axis = 1) + result['actual_beneficiaries'] = result. actual_beneficiaries / self.beneficiaries_unit + result['actual_amount'] = result. actual_amount / self.amount_unit + + result = result[["variable","actual_amount","actual_beneficiaries"]].set_index("variable") + return result From d6969732a4c5d9c77771c72aff1f9537bb796761 Mon Sep 17 00:00:00 2001 From: cgl Date: Fri, 1 Sep 2023 17:48:19 +0200 Subject: [PATCH 4/8] Ajoute des variables de csg dans model/common --- openfisca_france_data/model/common.py | 20 ++++++++++++++++++++ setup.py | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/openfisca_france_data/model/common.py b/openfisca_france_data/model/common.py index f9730a7f..37516265 100644 --- a/openfisca_france_data/model/common.py +++ b/openfisca_france_data/model/common.py @@ -96,6 +96,26 @@ def formula(individu, period): + individu('csg_imposable_chomage', period) + individu('csg_deductible_chomage', period) ) + +class csg_retraite(Variable): + value_type = float + entity = Individu + label = 'Contribution sociale généralisée sur les non salariés' + definition_period = YEAR + def formula(individu, period): + csg_imposable_retraite = individu('csg_imposable_retraite', period, options = [ADD]) + csg_deductible_retraite = individu('csg_deductible_retraite', period, options = [ADD]) + return csg_deductible_retraite + csg_imposable_retraite + +class csg_chomage(Variable): + value_type = float + entity = Individu + label = 'Contribution sociale généralisée sur les non salariés' + definition_period = YEAR + def formula(individu, period): + csg_imposable_chomage = individu('csg_imposable_chomage', period, options = [ADD]) + csg_deductible_chomage = individu('csg_deductible_chomage', period, options = [ADD]) + return csg_deductible_chomage + csg_imposable_chomage class impot_revenu(Variable): diff --git a/setup.py b/setup.py index cc7fee5a..1bd7c282 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,9 @@ package_data = { 'openfisca_france_data': ['assets/aggregats/taxipp/agregats_tests_taxipp_2_0.xlsx', 'assets/aggregats/ines/ines_2019.json', - 'reforms/old_openfisca_france_reforms/parameters/*.yaml'], + 'reforms/old_openfisca_france_reforms/parameters/*.yaml', + 'assets/aggregats/ines/ines_2020.json', + 'assets/aggregats/france_entiere/*.json'], }, entry_points = { 'console_scripts': [ From 121daa002382752ebc5ce0966b409bed1045f9a3 Mon Sep 17 00:00:00 2001 From: cgl Date: Mon, 4 Sep 2023 09:34:14 +0200 Subject: [PATCH 5/8] fix --- openfisca_france_data/aggregates.py | 28 +++++++++++++++++-- .../france_entiere/france_entiere_2021.json | 4 +-- openfisca_france_data/model/common.py | 4 +-- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/openfisca_france_data/aggregates.py b/openfisca_france_data/aggregates.py index dcfca474..ae47df5d 100644 --- a/openfisca_france_data/aggregates.py +++ b/openfisca_france_data/aggregates.py @@ -6,7 +6,8 @@ import numpy as np import pandas as pd import pkg_resources - +import os +from datetime import datetime from openfisca_survey_manager.aggregates import AbstractAggregates from openfisca_france_data import AGGREGATES_DEFAULT_VARS # type: ignore @@ -39,7 +40,7 @@ def __init__(self, survey_scenario = None, target_source = None): def load_actual_data(self, year = None): target_source = self.target_source - assert target_source in ["ines", "taxipp"], "les options possible pour source_cible sont ines ou taxipp" + assert target_source in ["ines", "taxipp", "france_entiere"], "les options possible pour source_cible sont ines, taxipp ou france_entiere" assert year is not None if target_source == "taxipp": @@ -120,10 +121,31 @@ def load_actual_data(self, year = None): with open(ines_aggregates_file, 'r') as f: data = json.load(f) - result = pd.DataFrame(data['data']).drop(['source', 'notes'], axis = 1) + result = pd.DataFrame(data['data']).drop(['source'], axis = 1) result['actual_beneficiaries'] = result. actual_beneficiaries / self.beneficiaries_unit result['actual_amount'] = result. actual_amount / self.amount_unit result = result[["variable","actual_amount","actual_beneficiaries"]].set_index("variable") return result + + def to_csv(self, path = None, absolute = True, amount = True, beneficiaries = True, default = 'actual', + relative = True, target = "reform"): + """Saves the table to csv.""" + assert path is not None + + if os.path.isdir(path): + now = datetime.now() + file_path = os.path.join(path, 'Aggregates_%s_%s_%s.%s' % (self.target_source,self.year,now.strftime('%d-%m-%Y'), "csv")) + else: + file_path = path + + df = self.get_data_frame( + absolute = absolute, + amount = amount, + beneficiaries = beneficiaries, + default = default, + relative = relative, + target = target, + ) + df.to_csv(file_path, index = False, header = True) diff --git a/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2021.json b/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2021.json index 4440b74a..06411f68 100644 --- a/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2021.json +++ b/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2021.json @@ -111,8 +111,8 @@ }, { "variable":"apl", - "actual_beneficiaries": 6743703175, - "actual_amount": 0, + "actual_beneficiaries": 0, + "actual_amount": 6743703175, "source": "Rapport du Directeur comptable et financier sur les comptes de l'exercice 2021, CAF (https://www.caf.fr/sites/default/files/medias/cnaf/Nous_connaitre/qui%20sommes%20nous/presentation/Comptes-et-financements/2021/Rapport_Dcf_comptes_exercice2021.pdf)" }, { diff --git a/openfisca_france_data/model/common.py b/openfisca_france_data/model/common.py index 37516265..13049ba8 100644 --- a/openfisca_france_data/model/common.py +++ b/openfisca_france_data/model/common.py @@ -100,7 +100,7 @@ def formula(individu, period): class csg_retraite(Variable): value_type = float entity = Individu - label = 'Contribution sociale généralisée sur les non salariés' + label = 'CSG sur les retraites' definition_period = YEAR def formula(individu, period): csg_imposable_retraite = individu('csg_imposable_retraite', period, options = [ADD]) @@ -110,7 +110,7 @@ def formula(individu, period): class csg_chomage(Variable): value_type = float entity = Individu - label = 'Contribution sociale généralisée sur les non salariés' + label = 'CSG sur le chomage' definition_period = YEAR def formula(individu, period): csg_imposable_chomage = individu('csg_imposable_chomage', period, options = [ADD]) From b4520c86df09dbc199eabd9b79b71c3978d2ab8c Mon Sep 17 00:00:00 2001 From: cgl Date: Mon, 4 Sep 2023 14:38:25 +0200 Subject: [PATCH 6/8] Corrige des agregats --- .../aggregats/france_entiere/france_entiere_2019.json | 5 +++-- .../aggregats/france_entiere/france_entiere_2021.json | 7 ++++--- openfisca_france_data/assets/aggregats/ines/ines_2019.json | 6 +++--- openfisca_france_data/assets/aggregats/ines/ines_2020.json | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2019.json b/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2019.json index f8d7fb14..55d37846 100644 --- a/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2019.json +++ b/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2019.json @@ -120,8 +120,9 @@ }, { "variable":"aspa", - "actual_beneficiaries":0, - "actual_amount": 0 + "actual_beneficiaries":600000, + "actual_amount": 3500000000, + "source": "Panorama DREES les retraites et les retraités, édition 2021" }, { "variable":"asi", diff --git a/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2021.json b/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2021.json index 06411f68..2d67b16a 100644 --- a/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2021.json +++ b/openfisca_france_data/assets/aggregats/france_entiere/france_entiere_2021.json @@ -64,7 +64,7 @@ { "variable":"asf", "actual_beneficiaries": 0, - "actual_amount": 174000000, + "actual_amount": 1740000000, "source": "Dossier statistique des prestations familiales de la DSS, 2022 (https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/DSS/2022/Cahier_stat_Prestations_familiales_2022.pdf)" }, { @@ -117,8 +117,9 @@ }, { "variable":"aspa", - "actual_beneficiaries":0, - "actual_amount": 0 + "actual_beneficiaries":660000, + "actual_amount": 3600000000, + "source": "Panorama DREES les retraites et les retraités, édition 2023" }, { "variable":"asi", diff --git a/openfisca_france_data/assets/aggregats/ines/ines_2019.json b/openfisca_france_data/assets/aggregats/ines/ines_2019.json index 18a87b06..a7273d98 100644 --- a/openfisca_france_data/assets/aggregats/ines/ines_2019.json +++ b/openfisca_france_data/assets/aggregats/ines/ines_2019.json @@ -1,5 +1,5 @@ { - "documentation":"Pour les prestations sociales, les cotisations et prélèvements sociaux, note de validation INES 2019, pour l'ir note de validation 2019 et 2020", + "documentation":"Note de validation INES 2019", "data":[ { "variable":"af", @@ -134,8 +134,8 @@ { "variable":"irpp", "actual_beneficiaries":0, - "actual_amount":64500000000, - "notes":"somme de prélèvement à la source réalisés en 2019 sur revenus 2019 (note 2019) 69,2 + impot résiduel sur le revenu dû au titre des revenus 2019, net de crédits et réduction (note 2020) -8.1 sans prendre en compte le crédit d'impôt de prélèvement forfaitaire non libératoire de N-1 de 3,4 soit 3.4 - 8.1 + 69.2 " + "actual_amount":69400000000, + "notes":"Impot payé en 2019, en parti sur revenus 2019 et 2018" }, { "variable":"prelevement_forfaitaire_unique_ir", diff --git a/openfisca_france_data/assets/aggregats/ines/ines_2020.json b/openfisca_france_data/assets/aggregats/ines/ines_2020.json index b18f7d82..ba52c2f4 100644 --- a/openfisca_france_data/assets/aggregats/ines/ines_2020.json +++ b/openfisca_france_data/assets/aggregats/ines/ines_2020.json @@ -134,8 +134,8 @@ { "variable":"irpp", "actual_beneficiaries":0, - "actual_amount":0, - "notes":"somme de prélèvement à la source réalisés en 2019 sur revenus 2019 (note 2019) 69,2 + impot résiduel sur le revenu dû au titre des revenus 2019, net de crédits et réduction (note 2020) -8.1 sans prendre en compte le crédit d'impôt de prélèvement forfaitaire non libératoire de N-1 de 3,4 soit 3.4 - 8.1 + 69.2 " + "actual_amount":73900000000, + "notes":"Impot payé en 2020, en parti sur revenus 2020 et 2019" }, { "variable":"prelevement_forfaitaire_unique_ir", From 70bde7b9e3d652f93901e3a07bb09b36ea92e163 Mon Sep 17 00:00:00 2001 From: cgl Date: Mon, 4 Sep 2023 14:47:39 +0200 Subject: [PATCH 7/8] Bump --- CHANGELOG.md | 4 ++++ setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 124f350d..8fa3c413 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +### 2.0.7 [#239](https://github.com/openfisca/openfisca-france-data/pull/239/files) +* New features +- Ajoute des nouveaux agrégats pour FranceAggregates + ### 2.0.6 [#240](https://github.com/openfisca/openfisca-france-data/pull/240) * Technical changes - Rapatrie certaines réformes qui ont été supprimés dans openfisca france par la (PR 2177)[https://github.com/Supprime vieilles réformes non utilisées openfisca-france#2177] mais qui sont encore utilisées dans ce dépôt diff --git a/setup.py b/setup.py index 1bd7c282..47c9ea66 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name = "OpenFisca-France-Data", - version = "2.0.6", + version = "2.0.7", description = "OpenFisca-France-Data module to work with French survey data", long_description = long_description, long_description_content_type="text/markdown", From 275eb4cfe815d732f79dd45fa33bd133241504c7 Mon Sep 17 00:00:00 2001 From: cgl Date: Wed, 6 Sep 2023 09:36:25 +0200 Subject: [PATCH 8/8] =?UTF-8?q?Ajoute=20les=20agr=C3=A9gats=20france=5Fent?= =?UTF-8?q?iere=20dans=20la=20ci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/erfs_fpr/integration/test_aggregates.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/erfs_fpr/integration/test_aggregates.py b/tests/erfs_fpr/integration/test_aggregates.py index c583c440..2b07ffd1 100644 --- a/tests/erfs_fpr/integration/test_aggregates.py +++ b/tests/erfs_fpr/integration/test_aggregates.py @@ -40,6 +40,7 @@ def test_erfs_fpr_survey_simulation_aggregates(year = REFERENCE_YEAR, rebuild_in ) aggregates_taxipp = Aggregates(survey_scenario = survey_scenario, target_source = 'taxipp') aggregates_ines = Aggregates(survey_scenario = survey_scenario, target_source = 'ines') + aggregates_france_entiere = Aggregates(survey_scenario = survey_scenario, target_source = 'france_entiere') if False: mtr_rd = survey_scenario.compute_marginal_tax_rate(target_variable = 'revenu_disponible', period = year, use_baseline = True) @@ -54,7 +55,7 @@ def test_erfs_fpr_survey_simulation_aggregates(year = REFERENCE_YEAR, rebuild_in np.quantile(mtr_rd, q = np.arange(0, 1.1, .1)) - return survey_scenario, aggregates_taxipp.get_data_frame(), aggregates_ines.get_data_frame() + return survey_scenario, aggregates_taxipp.get_data_frame(), aggregates_ines.get_data_frame(), aggregates_france_entiere.get_data_frame() def test_erfs_fpr_aggregates_reform(): @@ -112,7 +113,7 @@ def main(year, configfile = None, verbose = False): years = [year] for year in years: - survey_scenario, aggregates_taxipp, aggregates_ines = test_erfs_fpr_survey_simulation_aggregates( + survey_scenario, aggregates_taxipp, aggregates_ines, aggregates_france_entiere = test_erfs_fpr_survey_simulation_aggregates( year = year, rebuild_input_data = False, use_marginal_tax_rate = True, @@ -121,8 +122,9 @@ def main(year, configfile = None, verbose = False): ) df = pd.concat({ - "taxipp": aggregates_taxipp, "ines": aggregates_ines, + "france_entiere": aggregates_france_entiere, + "taxipp": aggregates_taxipp }) df.to_csv(f'aggregates_erfs_fpr_{year}.csv')