OpenFisca-France 172.0.2__py3-none-any.whl → 172.0.3__py3-none-any.whl

openfisca_france/model/prelevements_obligatoires/impot_revenu/ir.py

@@ -645,7 +645,7 @@ class revenu_categoriel_plus_values(Variable):
         return f3wb + pre_result
 
 
-class revenu_categoriel_deductions(Variable):
+class revenu_categoriel_tspr(Variable):
     value_type = float
     entity = FoyerFiscal
     label = 'Revenu catégoriel - Traitements, salaires, pensions et rentes'
@@ -653,10 +653,10 @@ class revenu_categoriel_deductions(Variable):
     definition_period = YEAR
 
     def formula(foyer_fiscal, period, parameters):
-        deductions_i = foyer_fiscal.members('traitements_salaires_pensions_rentes', period)
+        tspr_i = foyer_fiscal.members('traitements_salaires_pensions_rentes', period)
         indu_plaf_abat_pen = foyer_fiscal('indu_plaf_abat_pen', period)
 
-        traitements_salaires_pensions_rentes = foyer_fiscal.sum(deductions_i)
+        traitements_salaires_pensions_rentes = foyer_fiscal.sum(tspr_i)
 
         return traitements_salaires_pensions_rentes + indu_plaf_abat_pen
 
@@ -1193,13 +1193,13 @@ class revenu_categoriel(Variable):
         '''
         Revenus Categoriels
         '''
-        rev_cat_deductions = foyer_fiscal('revenu_categoriel_deductions', period)
+        rev_cat_tspr = foyer_fiscal('revenu_categoriel_tspr', period)
         rev_cat_rvcm = foyer_fiscal('revenu_categoriel_capital', period)
         rev_cat_rfon = foyer_fiscal('revenu_categoriel_foncier', period)
         rev_cat_rpns = foyer_fiscal('revenu_categoriel_non_salarial', period)
         rev_cat_pv = foyer_fiscal('revenu_categoriel_plus_values', period)
 
-        return rev_cat_deductions + rev_cat_rvcm + rev_cat_rfon + rev_cat_rpns + rev_cat_pv
+        return rev_cat_tspr + rev_cat_rvcm + rev_cat_rfon + rev_cat_rpns + rev_cat_pv
 
 
 ###############################################################################

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

@@ -236,11 +236,8 @@ cotisations_salarie_by_categorie_salarie = {
     }
 
 
-# TODO: Rename bareme_by_type_sal_name to bareme_by_categorie_salarie
-
-
 def apply_bareme_for_relevant_type_sal(
-        bareme_by_type_sal_name,
+        bareme_by_categorie_salarie,
         bareme_name,
         categorie_salarie,
         base,
@@ -248,7 +245,7 @@ def apply_bareme_for_relevant_type_sal(
         round_base_decimals = DEFAULT_ROUND_BASE_DECIMALS,
         ):
     '''Apply bareme corresponding to bareme_name to the relevant categorie_salarie.'''
-    assert bareme_by_type_sal_name is not None
+    assert bareme_by_categorie_salarie is not None
     assert bareme_name is not None
     assert categorie_salarie is not None
     assert base is not None
@@ -260,15 +257,15 @@ def apply_bareme_for_relevant_type_sal(
             if categorie_salarie_type == TypesCategorieSalarie.non_pertinent:
                 continue
 
-            if bareme_by_type_sal_name._name == 'cotisations_employeur_after_preprocessing':
+            if bareme_by_categorie_salarie._name == 'cotisations_employeur_after_preprocessing':
                 cotisations_by_categorie_salarie = cotisations_employeur_by_categorie_salarie
-            elif bareme_by_type_sal_name._name == 'cotisations_salarie_after_preprocessing':
+            elif bareme_by_categorie_salarie._name == 'cotisations_salarie_after_preprocessing':
                 cotisations_by_categorie_salarie = cotisations_salarie_by_categorie_salarie
             else:
                 NameError()
 
             try:
-                categorie_salarie_baremes = bareme_by_type_sal_name[categorie_salarie_type.name]
+                categorie_salarie_baremes = bareme_by_categorie_salarie[categorie_salarie_type.name]
             except KeyError as e:
                 # FIXME: dirty fix since public_titulaire_militaire does not exist
                 if categorie_salarie_type.name == 'public_titulaire_militaire':
@@ -278,7 +275,7 @@ def apply_bareme_for_relevant_type_sal(
             if bareme_name in cotisations_by_categorie_salarie[categorie_salarie_type.name]:
                 bareme = categorie_salarie_baremes[bareme_name]
             else:
-                KeyError(f'{bareme_name} not in {bareme_by_type_sal_name._name} for {categorie_salarie_type.name}')
+                KeyError(f'{bareme_name} not in {bareme_by_categorie_salarie._name} for {categorie_salarie_type.name}')
                 continue
 
             yield bareme.calc(
@@ -331,9 +328,9 @@ def apply_bareme(individu, period, parameters, cotisation_type = None, bareme_na
 def compute_cotisation(individu, period, parameters, cotisation_type = None, bareme_name = None):
     assert cotisation_type is not None
     if cotisation_type == 'employeur':
-        bareme_by_type_sal_name = parameters(period).cotsoc.cotisations_employeur
+        bareme_by_categorie_salarie_name = parameters(period).cotsoc.cotisations_employeur
     elif cotisation_type == 'salarie':
-        bareme_by_type_sal_name = parameters(period).cotsoc.cotisations_salarie
+        bareme_by_categorie_salarie_name = parameters(period).cotsoc.cotisations_salarie
     assert bareme_name is not None
 
     assiette_cotisations_sociales = individu('assiette_cotisations_sociales', period, options = [ADD])
@@ -341,7 +338,7 @@ def compute_cotisation(individu, period, parameters, cotisation_type = None, bar
     categorie_salarie = individu('categorie_salarie', period.first_month)
 
     cotisation = apply_bareme_for_relevant_type_sal(
-        bareme_by_type_sal_name = bareme_by_type_sal_name,
+        bareme_by_categorie_salarie = bareme_by_categorie_salarie_name,
         bareme_name = bareme_name,
         base = assiette_cotisations_sociales,
         plafond_securite_sociale = plafond_securite_sociale,

openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/exonerations.py

@@ -176,13 +176,13 @@ class exoneration_cotisations_employeur_jei(Variable):
         categorie_salarie = individu('categorie_salarie', period)
         smic_proratise = individu('smic_proratise', period)
 
-        bareme_by_type_sal_name = parameters(period).cotsoc.cotisations_employeur
+        bareme_by_categorie_salarie_name = parameters(period).cotsoc.cotisations_employeur
         bareme_names = ['vieillesse_deplafonnee', 'vieillesse_plafonnee', 'maladie', 'famille']
 
         exoneration = smic_proratise * 0.0
         for bareme_name in bareme_names:
             exoneration += apply_bareme_for_relevant_type_sal(
-                bareme_by_type_sal_name = bareme_by_type_sal_name,
+                bareme_by_categorie_salarie = bareme_by_categorie_salarie_name,
                 bareme_name = bareme_name,
                 categorie_salarie = categorie_salarie,
                 base = assiette_allegement,
@@ -220,14 +220,14 @@ class exoneration_cotisations_employeur_jei(Variable):
 
         # Cette formule ne tient pas compte du montant maximal d'exonération dont chaque établissement peut bénéficier et qui est de 5 PSS (231 840 € en 2024)
 
-        bareme_by_type_sal_name = parameters(period).cotsoc.cotisations_employeur
+        bareme_by_categorie_salarie_name = parameters(period).cotsoc.cotisations_employeur
         bareme_names = ['vieillesse_deplafonnee', 'vieillesse_plafonnee', 'maladie', 'famille']
         plafond_part_remuneration = parameters(period).prelevements_sociaux.reductions_cotisations_sociales.jei.plafond_part_remuneration
 
         exoneration = smic_proratise * 0.0
         for bareme_name in bareme_names:
             exoneration += apply_bareme_for_relevant_type_sal(
-                bareme_by_type_sal_name = bareme_by_type_sal_name,
+                bareme_by_categorie_salarie = bareme_by_categorie_salarie_name,
                 bareme_name = bareme_name,
                 categorie_salarie = categorie_salarie,
                 base = min_(assiette_allegement, plafond_part_remuneration * smic_proratise),

openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/preprocessing.py

@@ -50,47 +50,34 @@ def build_pat(parameters):
         'construction_plus_de_50_salaries',
         ]
     # Autres thématiques
-    commun.children.update(chomage.ags.employeur.children)
-    if chomage.ags.employeur.metadata is not None and chomage.ags.employeur.metadata.get('order') is not None:
-        commun.metadata['order'] += chomage.ags.employeur.metadata['order']
-    commun.children.update(chomage.asf.employeur.children)
-    if chomage.asf.employeur.metadata is not None and chomage.asf.employeur.metadata.get('order') is not None:
-        commun.metadata['order'] += chomage.asf.employeur.metadata['order']
-    commun.children.update(chomage.chomage.employeur.children)
-    if chomage.chomage.employeur.metadata is not None and chomage.chomage.employeur.metadata.get('order') is not None:
-        commun.metadata['order'] += chomage.chomage.employeur.metadata['order']
-    commun.children.update(regime_general.csa.employeur.children)
-    if regime_general.csa.employeur.metadata is not None and regime_general.csa.employeur.metadata.get('order') is not None:
-        commun.metadata['order'] += regime_general.csa.employeur.metadata['order']
-    commun.children.update(regime_general.famille.employeur.children)
-    if regime_general.famille.employeur.metadata is not None and regime_general.famille.employeur.metadata.get('order') is not None:
-        commun.metadata['order'] += regime_general.famille.employeur.metadata['order']
-    commun.children.update(regime_general.penibilite.children)
-    if regime_general.penibilite.metadata is not None and regime_general.penibilite.metadata.get('order') is not None:
-        commun.metadata['order'] += regime_general.penibilite.metadata['order']
-    commun.children.update(regime_general.cnav.employeur.children)
-    if regime_general.cnav.employeur.metadata is not None and regime_general.cnav.employeur.metadata.get('order') is not None:
-        commun.metadata['order'] += regime_general.cnav.employeur.metadata['order']
-    commun.children.update(regime_general.mmid.employeur.children)
-    if regime_general.mmid.employeur.metadata is not None and regime_general.mmid.employeur.metadata.get('order') is not None:
-        commun.metadata['order'] += regime_general.mmid.employeur.metadata['order']
+    thematiques = [
+        chomage.ags.employeur,
+        chomage.asf.employeur,
+        chomage.chomage.employeur,
+        regime_general.csa.employeur,
+        regime_general.famille.employeur,
+        regime_general.penibilite,
+        regime_general.cnav.employeur,
+        regime_general.mmid.employeur,
+        ]
+    for thematique in thematiques:
+        if thematique.metadata is not None and thematique.metadata.get('order') is not None:
+            commun.metadata['order'] += thematique.metadata['order']
+        commun.children.update(thematique.children)
 
     # Fnal (avec renommage)
     commun.children.update(autres.fnal.children)
-    commun.children['fnal_contribution_moins_de_20_salaries'] = commun.children.pop('contribution_moins_de_20_salaries')
-    commun.children['fnal_contribution_moins_de_50_salaries'] = commun.children.pop('contribution_moins_de_50_salaries')
-    commun.children['fnal_contribution_plus_de_10_salaries'] = commun.children.pop('contribution_plus_de_10_salaries')
-    commun.children['fnal_contribution_plus_de_20_salaries'] = commun.children.pop('contribution_plus_de_20_salaries')
-    commun.children['fnal_contribution_plus_de_50_salaries'] = commun.children.pop('contribution_plus_de_50_salaries')
-    commun.children['fnal_cotisation'] = commun.children.pop('cotisation')
-    commun.metadata['order'] += [
-        'fnal_contribution_plus_de_10_salaries',
-        'fnal_contribution_moins_de_20_salaries',
-        'fnal_contribution_plus_de_20_salaries',
-        'fnal_contribution_moins_de_50_salaries',
-        'fnal_contribution_plus_de_50_salaries',
-        'fnal_cotisation',
+    fnal_keys = [
+        'contribution_plus_de_10_salaries',
+        'contribution_moins_de_20_salaries',
+        'contribution_plus_de_20_salaries',
+        'contribution_moins_de_50_salaries',
+        'contribution_plus_de_50_salaries',
+        'cotisation',
         ]
+    for key in fnal_keys:
+        commun.children[f'fnal_{key}'] = commun.children.pop(key)
+    commun.metadata['order'] += [f'fnal_{key}' for key in fnal_keys]
 
     commun.children.update(autres.fin_syndic.children)  # À harmoniser !
     if autres.fin_syndic.metadata is not None and autres.fin_syndic.metadata.get('order') is not None:

openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/stage.py

@@ -84,10 +84,10 @@ class exoneration_cotisations_employeur_stagiaire(Variable):
         stagiaire = individu('stagiaire', period)
         categorie_salarie = individu('categorie_salarie', period)
 
-        bareme_by_type_sal_name = parameters(period).cotsoc.cotisations_employeur
+        bareme_by_categorie_salarie_name = parameters(period).cotsoc.cotisations_employeur
         exoneration = sum(
             apply_bareme_for_relevant_type_sal(
-                bareme_by_type_sal_name = bareme_by_type_sal_name,
+                bareme_by_categorie_salarie = bareme_by_categorie_salarie_name,
                 bareme_name = bareme_name,
                 categorie_salarie = categorie_salarie,
                 base = stage_gratification_reintegration,
@@ -124,13 +124,13 @@ class exoneration_cotisations_salarie_stagiaire(Variable):
         stagiaire = individu('stagiaire', period)
         categorie_salarie = individu('categorie_salarie', period)
 
-        bareme_by_type_sal_name = parameters(period).cotsoc.cotisations_salarie
+        bareme_by_categorie_salarie_name = parameters(period).cotsoc.cotisations_salarie
         bareme_names = ['agff', 'chomage', 'asf']
 
         exoneration = plafond_securite_sociale * 0.0
         for bareme_name in bareme_names:
             exoneration += apply_bareme_for_relevant_type_sal(
-                bareme_by_type_sal_name = bareme_by_type_sal_name,
+                bareme_by_categorie_salarie = bareme_by_categorie_salarie_name,
                 bareme_name = bareme_name,
                 categorie_salarie = categorie_salarie,
                 base = stage_gratification_reintegration,

openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/travail_fonction_publique.py

@@ -16,11 +16,11 @@ class ati_atiacl(Variable):
         remuneration_principale = individu('remuneration_principale', period)
         categorie_salarie = individu('categorie_salarie', period)
         plafond_securite_sociale = individu('plafond_securite_sociale', period)
-        _P = parameters(period)
+        cotsoc = parameters(period).cotsoc
 
         # ATI : pour les fonctionnaires d'Etat, hors militaires
         cotisation_etat_hors_militaires = apply_bareme_for_relevant_type_sal(
-            bareme_by_type_sal_name = _P.cotsoc.cotisations_employeur,
+            bareme_by_categorie_salarie = cotsoc.cotisations_employeur,
             bareme_name = 'ati',
             base = remuneration_principale,
             plafond_securite_sociale = plafond_securite_sociale,
@@ -28,7 +28,7 @@ class ati_atiacl(Variable):
             )
         # ATIACL : pour les fonctionnaires territoriaux et hospitaliers
         cotisation_collectivites_locales = apply_bareme_for_relevant_type_sal(
-            bareme_by_type_sal_name = _P.cotsoc.cotisations_employeur,
+            bareme_by_categorie_salarie =cotsoc.cotisations_employeur,
             bareme_name = 'atiacl',
             base = remuneration_principale,
             plafond_securite_sociale = plafond_securite_sociale,
@@ -93,7 +93,7 @@ class contribution_exceptionnelle_solidarite(Variable):
             )
         # Ces déductions sont négatives
         cotisation = apply_bareme_for_relevant_type_sal(
-            bareme_by_type_sal_name = parameters.cotsoc.cotisations_salarie,
+            bareme_by_categorie_salarie = parameters.cotsoc.cotisations_salarie,
             bareme_name = 'excep_solidarite',
             base = assujettis * min_(
                 remuneration_brute + supplement_familial_traitement + primes_fonction_publique + deduction,
@@ -134,11 +134,11 @@ class fonds_emploi_hospitalier(Variable):
         remuneration_principale = individu('remuneration_principale', period)
         categorie_salarie = individu('categorie_salarie', period)
         plafond_securite_sociale = individu('plafond_securite_sociale', period)
-        _P = parameters(period)
+        cotsoc = parameters(period).cotsoc
 
         # Que pour fonctionnaires hospitaliers
         cotisation = apply_bareme_for_relevant_type_sal(
-            bareme_by_type_sal_name = _P.cotsoc.cotisations_employeur,
+            bareme_by_categorie_salarie = cotsoc.cotisations_employeur,
             bareme_name = 'feh',
             base = remuneration_principale,
             plafond_securite_sociale = plafond_securite_sociale,
@@ -158,10 +158,10 @@ class ircantec_salarie(Variable):
         assiette_cotisations_sociales = individu('assiette_cotisations_sociales', period)
         plafond_securite_sociale = individu('plafond_securite_sociale', period)
         categorie_salarie = individu('categorie_salarie', period)
-        _P = parameters(period)
+        cotsoc = parameters(period).cotsoc
 
         ircantec = apply_bareme_for_relevant_type_sal(
-            bareme_by_type_sal_name = _P.cotsoc.cotisations_salarie,
+            bareme_by_categorie_salarie = cotsoc.cotisations_salarie,
             bareme_name = 'ircantec',
             base = assiette_cotisations_sociales,
             plafond_securite_sociale = plafond_securite_sociale,
@@ -182,10 +182,10 @@ class ircantec_employeur(Variable):
         assiette_cotisations_sociales = individu('assiette_cotisations_sociales', period)
         plafond_securite_sociale = individu('plafond_securite_sociale', period)
         categorie_salarie = individu('categorie_salarie', period)
-        _P = parameters(period)
+        cotsoc = parameters(period).cotsoc
 
         ircantec = apply_bareme_for_relevant_type_sal(
-            bareme_by_type_sal_name = _P.cotsoc.cotisations_employeur,
+            bareme_by_categorie_salarie = cotsoc.cotisations_employeur,
             bareme_name = 'ircantec',
             base = assiette_cotisations_sociales,
             plafond_securite_sociale = plafond_securite_sociale,
@@ -206,8 +206,8 @@ class pension_salarie(Variable):
         traitement_indiciaire_brut = individu('traitement_indiciaire_brut', period)
         nouvelle_bonification_indiciaire = individu('nouvelle_bonification_indiciaire', period)
         categorie_salarie = individu('categorie_salarie', period)
-        _P = parameters(period)
-        sal = _P.cotsoc.cotisations_salarie
+        cotsoc = parameters(period).cotsoc
+        sal = cotsoc.cotisations_salarie
 
         terr_or_hosp = (
             (categorie_salarie == TypesCategorieSalarie.public_titulaire_territoriale) | (categorie_salarie == TypesCategorieSalarie.public_titulaire_hospitaliere)
@@ -244,8 +244,7 @@ class pension_employeur(Variable):
             )
         etat = (categorie_salarie == TypesCategorieSalarie.public_titulaire_etat)
         militaire = (categorie_salarie == TypesCategorieSalarie.public_titulaire_militaire)
-        _P = parameters(period)
-        pat = _P.cotsoc.cotisations_employeur
+        pat = parameters(period).cotsoc.cotisations_employeur
 
         montant = (
             etat * pat['public_titulaire_etat']['pension'].calc(remuneration_principale)
@@ -281,8 +280,7 @@ class rafp_salarie(Variable):
 
         parametres_rafp = parameters(period).prelevements_sociaux.cotisations_secteur_public.rafp
         taux_plafond_tib = parametres_rafp.rafp_plaf_assiette
-        _P = parameters(period)
-        bareme_rafp_salarie = _P.cotsoc.cotisations_salarie.public_titulaire_etat['rafp']
+        bareme_rafp_salarie = parameters(period).cotsoc.cotisations_salarie.public_titulaire_etat['rafp']
 
         base_imposable = primes_fonction_publique + supplement_familial_traitement + indemnite_residence + avantage_en_nature
         assiette = (min_(base_imposable, taux_plafond_tib * traitement_indiciaire_brut) + gipa) * eligible
@@ -317,8 +315,7 @@ class rafp_employeur(Variable):
 
         parametres_rafp = parameters(period).prelevements_sociaux.cotisations_secteur_public.rafp
         taux_plafond_tib = parametres_rafp.rafp_plaf_assiette
-        _P = parameters(period)
-        bareme_rafp_employeur = _P.cotsoc.cotisations_employeur.public_titulaire_etat['rafp']
+        bareme_rafp_employeur = parameters(period).cotsoc.cotisations_employeur.public_titulaire_etat['rafp']
 
         base_imposable = primes_fonction_publique + supplement_familial_traitement + indemnite_residence + indemnite_compensatrice_csg + avantage_en_nature
         assiette = (min_(base_imposable, taux_plafond_tib * traitement_indiciaire_brut) + gipa) * eligible

openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/travail_prive.py

@@ -254,7 +254,7 @@ class agff_employeur(Variable):
         parameters = parameters(period).cotsoc
 
         cotisation_non_cadre = apply_bareme_for_relevant_type_sal(
-            bareme_by_type_sal_name = parameters.cotisations_employeur,
+            bareme_by_categorie_salarie = parameters.cotisations_employeur,
             bareme_name = 'agffnc',
             base = assiette_cotisations_sociales,
             plafond_securite_sociale = plafond_securite_sociale,
@@ -262,7 +262,7 @@ class agff_employeur(Variable):
             )
 
         cotisation_cadre = apply_bareme_for_relevant_type_sal(
-            bareme_by_type_sal_name = parameters.cotisations_employeur,
+            bareme_by_categorie_salarie = parameters.cotisations_employeur,
             bareme_name = 'agffc',
             base = assiette_cotisations_sociales,
             plafond_securite_sociale = plafond_securite_sociale,
@@ -528,7 +528,7 @@ class arrco_salarie(Variable):
             * arrco_tranche_a_taux_salarie
             )
 
-        public = (
+        prive = (
             (categorie_salarie == TypesCategorieSalarie.prive_non_cadre)
             + (categorie_salarie == TypesCategorieSalarie.prive_cadre)
             )
@@ -537,7 +537,7 @@ class arrco_salarie(Variable):
             cotisation_minimale
             * (arrco_tranche_a_taux_salarie == 0)
             + cotisation_entreprise
-            ) * public
+            ) * prive
 
 
 class arrco_employeur(Variable):
@@ -569,13 +569,13 @@ class arrco_employeur(Variable):
             * arrco_tranche_a_taux_employeur
             )
 
-        public = (
+        prive = (
             (categorie_salarie == TypesCategorieSalarie.prive_non_cadre)
             + (categorie_salarie == TypesCategorieSalarie.prive_cadre)
             )
         return (
             cotisation_minimale * (arrco_tranche_a_taux_employeur == 0) + cotisation_entreprise
-            ) * public
+            ) * prive
 
 
 class chomage_salarie(Variable):

openfisca_france/model/revenus/activite/salarie.py

@@ -214,7 +214,7 @@ class apprentissage_contrat_debut(Variable):
 class arrco_tranche_a_taux_employeur(Variable):
     value_type = float
     entity = Individu
-    label = "Taux ARRCO tranche A employeur) propre à l'entreprise"
+    label = "Taux ARRCO tranche A employeur propre à l'entreprise"
     definition_period = MONTH
     set_input = set_input_dispatch_by_period
 
@@ -222,7 +222,7 @@ class arrco_tranche_a_taux_employeur(Variable):
 class arrco_tranche_a_taux_salarie(Variable):
     value_type = float
     entity = Individu
-    label = "Taux ARRCO tranche A salarié) propre à l'entreprise"
+    label = "Taux ARRCO tranche A salarié propre à l'entreprise"
     definition_period = MONTH
     set_input = set_input_dispatch_by_period
 
@@ -246,7 +246,7 @@ class avantage_en_nature_valeur_reelle(Variable):
 class indemnites_compensatrices_conges_payes(Variable):
     value_type = float
     entity = Individu
-    label = 'indemnites_compensatrices_conges_payes'
+    label = 'Indemnités compensatrices de congés payés'
     definition_period = MONTH
     set_input = set_input_divide_by_period
 
@@ -254,7 +254,7 @@ class indemnites_compensatrices_conges_payes(Variable):
 class indemnite_fin_contrat_due(Variable):
     value_type = bool
     entity = Individu
-    label = 'indemnite_fin_contrat_due'
+    label = 'Indemnité de fin de contrat due'
     definition_period = MONTH
     set_input = set_input_divide_by_period
 
@@ -266,7 +266,7 @@ class TypesContratDeTravail(Enum):
     forfait_heures_semaines = 'Convention de forfait heures sur la semaine'
     forfait_heures_mois = 'Convention de forfait heures sur le mois'
     forfait_heures_annee = 'Convention de forfait heures sur l’année'
-    forfait_jours_annee = 'Convention de forfait hours sur l’année'
+    forfait_jours_annee = 'Convention de forfait jours sur l’année'
     sans_objet = 'Non renseigné'
 
 
@@ -964,12 +964,10 @@ class indemnites_forfaitaires(Variable):
 
 
 class salaire_de_base(Variable):
-    # Salaire brut sans les primes et les heures supplémentaires - généralement la première ligne du bulletin de paye.
     value_type = float
     entity = Individu
     label = 'Salaire de base'
     set_input = set_input_divide_by_period
-    reference = 'https://www.insee.fr/fr/metadonnees/definition/c1937'
     definition_period = MONTH
     unit = 'currency'
 

openfisca_france/parameters/taxation_capital/prelevements_sociaux/index.yaml

@@ -4,7 +4,6 @@ metadata:
   label_en: Social levies on financial income
   order:
   - csg
-  - crds
   - prelevement_social_exceptionnel_cnav
   - contribution_sociale_permanente_cnaf
   - contribution_sociale_cnav

{openfisca_france-172.0.2.dist-info → openfisca_france-172.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenFisca-France
-Version: 172.0.2
+Version: 172.0.3
 Summary: OpenFisca Rules as Code model for France.
 Author-email: OpenFisca Team <contact@openfisca.fr>
 Project-URL: Homepage, https://github.com/openfisca/openfisca-france

{openfisca_france-172.0.2.dist-info → openfisca_france-172.0.3.dist-info}/RECORD

@@ -40,7 +40,7 @@ openfisca_france/model/prelevements_obligatoires/impot_revenu/__init__.py,sha256
 openfisca_france/model/prelevements_obligatoires/impot_revenu/charges_deductibles.py,sha256=dXVJgd_dlJHxvgF_5JMWp9KBv-ovX4ubo43a32jTYG8,28152
 openfisca_france/model/prelevements_obligatoires/impot_revenu/contribution_differentielle_hauts_revenus.py,sha256=j9WUufMZ0khZclkc9UpSPL2p4dzM_mZqnELDMwCr08E,19328
 openfisca_france/model/prelevements_obligatoires/impot_revenu/credits_impot.py,sha256=d5gk7S7wgGI2VEYA6sStSwkivpo1-EBxAxWKR-EHMKA,128524
-openfisca_france/model/prelevements_obligatoires/impot_revenu/ir.py,sha256=KUX7PStqlLoBUA9F47Vod63N0NmOOi654W63CdWs5xw,185948
+openfisca_france/model/prelevements_obligatoires/impot_revenu/ir.py,sha256=xelAmdde8MTx8nfnev21aNxGJQrBJ7Aq9o3dEcJ6YCw,185912
 openfisca_france/model/prelevements_obligatoires/impot_revenu/plus_values_immobilieres.py,sha256=5gNB5ntU9I9XVeKhYyq94miM4Uv72HruO1Nu_jIPkn4,4754
 openfisca_france/model/prelevements_obligatoires/impot_revenu/reductions_impot_deplafonnees.py,sha256=TdC7EhYY5kw6wO3W4_Hmrz6SaA26Tc5H-93O9J4DPno,39211
 openfisca_france/model/prelevements_obligatoires/impot_revenu/reductions_impot_iom.py,sha256=Q8hoXmUfuQLqzWA0S1CIaP3M7fAVcKtBVkoj3xJiae0,139248
@@ -62,15 +62,15 @@ openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributi
 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=73WoA1N5VyKewDmo2cd7XGAV1crpUQawWMULcmgkLyA,27311
 openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/apprentissage.py,sha256=eXMAn8G40C2D1pUEs8c7Dj2iL7nvIVd_WCACGzNdrUk,11196
-openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/base.py,sha256=96NhETcZCaE7jai2T7sf7XnJ7Es9kdHRXKWiwoiSW7Y,13182
+openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/base.py,sha256=eekvxzcmuZC924jEI5P0Yu_YznLiaLcupVB378XFmoY,13165
 openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/chomage.py,sha256=BUI1fCE9frrtRvO1cCU3pOMRnWEvNK2m9uxAdZBGQ7A,2219
 openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/contrat_professionnalisation.py,sha256=8ideXZBZOWimNzDZ0mJN8GdUYsj-hlLKNEBKT7pIYS0,6274
-openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/exonerations.py,sha256=V31o2ZIPAznFFnoc1YCgLOwwsG4HlE9L5Y239B7F994,39015
-openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/preprocessing.py,sha256=FyxqYwgpcEGwjEgc3tdhW4r5KZKtaKoB9Ah6kNqDz9Q,25173
-openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/stage.py,sha256=9AHP_zThKouQcwQw-cZMFCSYV56crYxunGCjUlv1gRA,7272
-openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/travail_fonction_publique.py,sha256=2wwzivFc2nPGopMOkix6Zl9n-0WLME6h0_dt0qRgqAA,16382
+openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/exonerations.py,sha256=8HR0fqyFiQk6KpxsxIB9l3ooEjwFaLp_nBJqvz_JO3U,39059
+openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/preprocessing.py,sha256=6KrKqrIM24iPT7yAmGUEMWAQOAEyRmRelS2DKOw84-g,23047
+openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/stage.py,sha256=XB-TO4w0M0mrBz20PuO2496TTjPEvv6Y78w93lVt4-U,7316
+openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/travail_fonction_publique.py,sha256=X40rRp-OrWL7UOamK4b7WshPJhDnXyXw4A9o9wnqs3s,16394
 openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/travail_non_salarie.py,sha256=Qmvr-UruYGlj3Ay8WDT49uXUbwSanSVpeXCn7PpE4PU,24851
-openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/travail_prive.py,sha256=Xc9sWg-E8-G67jzhAzIYHEXysNlUlMGIjeTL8mbATo8,47167
+openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/travail_prive.py,sha256=DYqKr_DD0gsCarRRE84i4dUfc_a0YrJER90Ud0V_GnI,47171
 openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/cotisations_sociales/travail_totaux.py,sha256=vHJWfH0s0BYqbup9pcZisAI3cKGXlmBTdLYzWJOxgNA,9967
 openfisca_france/model/prelevements_obligatoires/taxe_habitation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openfisca_france/model/prelevements_obligatoires/taxe_habitation/taxe_habitation.py,sha256=-VDWVv6weZqQhPov1SA35Xl8w09AHV9ZXYPBdKimk_U,29326
@@ -141,7 +141,7 @@ openfisca_france/model/revenus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 openfisca_france/model/revenus/autres.py,sha256=LttEzxate9Crynjp3SOlHr-CUGDXEUTjzszzp2U7z_U,5109
 openfisca_france/model/revenus/activite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openfisca_france/model/revenus/activite/non_salarie.py,sha256=vpN7zsbmy0R_yCMRW3OVJYM1yYerUZOJiz3a0e8uwSg,69607
-openfisca_france/model/revenus/activite/salarie.py,sha256=sB8VrB0KK7WbjI2f2BLpZjKyzlP5c53RcvNFE3z-H_M,68268
+openfisca_france/model/revenus/activite/salarie.py,sha256=pUAwBMeCvPCfqIZAdfgb5Q4_dQTXuYdfkz36ErS5xMg,68085
 openfisca_france/model/revenus/capital/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openfisca_france/model/revenus/capital/financier.py,sha256=GLLYxCO2oCF2byjBSsgbYLa8b5MksS_DFU2d61fIpp0,24673
 openfisca_france/model/revenus/capital/foncier.py,sha256=FlFTItVvqhpH4VadqSVq5Iu80OHksSJofMDyMG4sdKk,4752
@@ -3809,7 +3809,7 @@ openfisca_france/parameters/taxation_capital/prelevement_forfaitaire/partir_2018
 openfisca_france/parameters/taxation_capital/prelevement_forfaitaire/partir_2018/taux_prelevement_produits_assurance_vie_non_eligibles_prelevement_forfaitaire_unique.yaml,sha256=jQKS6UhRKdJY4DqZVGHCjozAfWALA88NU14sOo9-cSU,2324
 openfisca_france/parameters/taxation_capital/prelevements_sociaux/contribution_sociale_cnav.yaml,sha256=D2qF3_ffWeGIEUhGkhB5sYUt0O3kpfO97l0J5T0rARk,1059
 openfisca_france/parameters/taxation_capital/prelevements_sociaux/contribution_sociale_permanente_cnaf.yaml,sha256=UFd5NW8Upb9xTcOiJK_BDowH96TB7xFd0PAXqL89z38,895
-openfisca_france/parameters/taxation_capital/prelevements_sociaux/index.yaml,sha256=C725mSYLePrXuh9Z0PSfb_4bpKz-Ew38h3DG0NuoYaE,394
+openfisca_france/parameters/taxation_capital/prelevements_sociaux/index.yaml,sha256=4UpOLsbicNE_YnoZniUMPurSesKEgKtSdiGW9GKLAU8,385
 openfisca_france/parameters/taxation_capital/prelevements_sociaux/prelevement_social_exceptionnel_cnav.yaml,sha256=lKLqiHMuwJOPVlHKnQzVoGZAZdFWWBcrkyCYQilY9Lo,795
 openfisca_france/parameters/taxation_capital/prelevements_sociaux/caps/index.yaml,sha256=RWIF6C6R3fGAjx906sqfv5J5lhnjajqYTsZVTWewhZE,645
 openfisca_france/parameters/taxation_capital/prelevements_sociaux/caps/produits_de_placement.yaml,sha256=2YJn94R_UtupyhJpe1lY-2DtHfxo97UEht0BmtkbZps,864
@@ -4129,8 +4129,8 @@ openfisca_france/scripts/performance/measure_spiral_performances.py,sha256=cQIxE
 openfisca_france/scripts/performance/measure_tests_performance.py,sha256=HYgSJy-OMZay2AZt6ztntgdUbW_RL2xMr-iHcK-zoVY,1869
 openfisca_france/situation_examples/__init__.py,sha256=BTRmrqk9lsjfhtPXsYcsWqXFEYyFpgLcxNs6oJsy8zk,262
 openfisca_france/situation_examples/couple.json,sha256=Ot1x4wl3IS-2-10X3V7ZUokkOMXi96s-xK7A0gNvRF4,862
-openfisca_france-172.0.2.dist-info/licenses/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
-openfisca_france-172.0.2.dist-info/METADATA,sha256=h8gfBElJ9z0dz0uEcV8X2dQKzqk2KhEj8926ip58Vf4,20852
-openfisca_france-172.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-openfisca_france-172.0.2.dist-info/top_level.txt,sha256=1LbD6QJWehKGIcjtaJ45tbQOSDiFEXOlIdgWRI_jaHU,17
-openfisca_france-172.0.2.dist-info/RECORD,,
+openfisca_france-172.0.3.dist-info/licenses/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
+openfisca_france-172.0.3.dist-info/METADATA,sha256=VnjbxDYccy-N9WE0UZsdXMeQ7Rz3pqfWNyVOYuvBgts,20852
+openfisca_france-172.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+openfisca_france-172.0.3.dist-info/top_level.txt,sha256=1LbD6QJWehKGIcjtaJ45tbQOSDiFEXOlIdgWRI_jaHU,17
+openfisca_france-172.0.3.dist-info/RECORD,,