OpenFisca-France 174.0.2__py3-none-any.whl → 174.2.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of OpenFisca-France might be problematic. Click here for more details.

Files changed (56) hide show
  1. openfisca_france/model/prelevements_obligatoires/impot_revenu/credits_impot.py +174 -25
  2. openfisca_france/model/prelevements_obligatoires/impot_revenu/reductions_impot_deplafonnees.py +6 -5
  3. openfisca_france/model/prelevements_obligatoires/impot_revenu/reductions_impot_iom.py +9 -9
  4. openfisca_france/model/prelevements_obligatoires/impot_revenu/reductions_impot_plafonnees.py +175 -76
  5. openfisca_france/model/prelevements_obligatoires/impot_revenu/variables_reductions_credits.py +270 -40
  6. openfisca_france/model/prelevements_obligatoires/prelevements_sociaux/contributions_sociales/capital.py +1 -1
  7. openfisca_france/parameters/chomage/allocations_assurance_chomage/ass/age_max.yaml +3 -0
  8. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/dons/dons_aux_partis_politiques/plafond_foyer.yaml +6 -2
  9. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/dons/dons_aux_partis_politiques/plafond_seul.yaml +3 -5
  10. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/dons/dons_coluche/plafond.yaml +1 -1
  11. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/dons/dons_coluche/taux.yaml +1 -1
  12. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/investissement_forestier/depenses_investissement_forestier/acquisition/plafond.yaml +2 -4
  13. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/investissement_forestier/depenses_investissement_forestier/acquisition/taux.yaml +1 -1
  14. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/investissement_forestier/depenses_investissement_forestier/assurance/plafond.yaml +2 -4
  15. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/investissement_forestier/depenses_investissement_forestier/assurance/taux.yaml +2 -1
  16. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/investissement_forestier/depenses_investissement_forestier/plafond_cga.yaml +6 -2
  17. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/location_meublee/index.yaml +2 -0
  18. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/outremer_investissement/domsoc/retrocession_plaf.yaml +1 -0
  19. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/outremer_investissement/logements_neufs/index.yaml +2 -0
  20. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/reduction_domtom/guadeloupe_martinique_reunion/plafond.yaml +5 -2
  21. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/reduction_domtom/guadeloupe_martinique_reunion/taux.yaml +5 -2
  22. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/reduction_domtom/guyane/plafond.yaml +5 -2
  23. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/reduction_domtom/guyane/taux.yaml +5 -2
  24. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/reduction_domtom/mayotte/plafond.yaml +5 -2
  25. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/reduction_domtom/mayotte/taux.yaml +5 -2
  26. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/souscriptions/pme/emprunts_contractes_reprise_pme/taux.yaml +11 -5
  27. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/souscriptions/pme/souscription_capital/taux22.yaml +1 -0
  28. openfisca_france/parameters/impot_revenu/calcul_reductions_impots/souscriptions/pme/souscription_capital/taux25.yaml +1 -0
  29. openfisca_france/parameters/impot_revenu/contributions_exceptionnelles/contribution_revenus_locatifs/taux.yaml +6 -2
  30. openfisca_france/parameters/prelevements_sociaux/autres_taxes_participations_assises_salaires/formation/toute_entreprise/cdd.yaml +14 -1
  31. openfisca_france/parameters/prelevements_sociaux/cotisations_securite_sociale_regime_general/accidents/taux/faible.yaml +31 -7
  32. openfisca_france/parameters/prelevements_sociaux/cotisations_taxes_independants_artisans_commercants/ret_ac/tous_independants/tout_salaire.yaml +14 -3
  33. openfisca_france/parameters/prelevements_sociaux/cotisations_taxes_independants_artisans_commercants/ret_comp_ac/art_ind_com/entre_1_plafond_rci_et_4_plafonds_pss.yaml +1 -0
  34. openfisca_france/parameters/prelevements_sociaux/cotisations_taxes_independants_artisans_commercants/ret_comp_ac/art_ind_com/montant_du_plafond_rci.yaml +14 -2
  35. openfisca_france/parameters/prelevements_sociaux/cotisations_taxes_independants_artisans_commercants/ret_comp_ac/art_ind_com/sous_plafond_rci.yaml +2 -0
  36. openfisca_france/parameters/prelevements_sociaux/regimes_complementaires_retraite_secteur_prive/agirc_arrco/employeur/agirc_arrco.yaml +1 -1
  37. openfisca_france/parameters/prelevements_sociaux/regimes_complementaires_retraite_secteur_prive/agirc_arrco/tx_appel.yaml +5 -2
  38. openfisca_france/parameters/prelevements_sociaux/regimes_complementaires_retraite_secteur_prive/agirc_arrco/tx_calcul.yaml +1 -1
  39. openfisca_france/parameters/prelevements_sociaux/regimes_complementaires_retraite_secteur_prive/agirc_arrco/tx_total.yaml +1 -1
  40. openfisca_france/parameters/prelevements_sociaux/regimes_complementaires_retraite_secteur_prive/cet2019/employeur/cet2019.yaml +1 -1
  41. openfisca_france/parameters/prelevements_sociaux/regimes_complementaires_retraite_secteur_prive/cet2019/salarie/cet2019.yaml +1 -1
  42. openfisca_france/parameters/prelevements_sociaux/regimes_complementaires_retraite_secteur_prive/cotisation_retraite_complementaire/chomage/taux.yaml +4 -1
  43. openfisca_france/parameters/prestations_sociales/education/bourses/enseignement_superieur/criteres_sociaux/age_maximum.yaml +1 -0
  44. openfisca_france/parameters/prestations_sociales/education/bourses/enseignement_superieur/criteres_sociaux/montants.yaml +3 -1
  45. openfisca_france/parameters/prestations_sociales/education/bourses/enseignement_superieur/criteres_sociaux/nationalites_hors_eee.yaml +4 -0
  46. openfisca_france/parameters/prestations_sociales/education/bourses/enseignement_superieur/criteres_sociaux/seuil_ressources_etudiant_autonome.yaml +1 -0
  47. openfisca_france/parameters/prestations_sociales/prestations_etat_de_sante/invalidite/aah/travail_esat/plafond/seul.yaml +5 -5
  48. openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/rsa/rsa_cond/duree_min_titre_sejour/eee.yaml +2 -2
  49. openfisca_france/parameters/prestations_sociales/solidarite_insertion/minima_sociaux/rsa/rsa_cond/patrimoine/abattement_valeur_locative_immo_non_loue.yaml +1 -1
  50. openfisca_france/parameters/taxation_capital/impot_fortune_immobiliere_ifi_partir_2018/bareme.yaml +1 -1
  51. openfisca_france/parameters/taxation_capital/prelevements_sociaux/prelevements_solidarite/produits_de_placement.yaml +4 -1
  52. {openfisca_france-174.0.2.dist-info → openfisca_france-174.2.0.dist-info}/METADATA +11 -3
  53. {openfisca_france-174.0.2.dist-info → openfisca_france-174.2.0.dist-info}/RECORD +56 -56
  54. {openfisca_france-174.0.2.dist-info → openfisca_france-174.2.0.dist-info}/WHEEL +0 -0
  55. {openfisca_france-174.0.2.dist-info → openfisca_france-174.2.0.dist-info}/licenses/LICENSE.AGPL.txt +0 -0
  56. {openfisca_france-174.0.2.dist-info → openfisca_france-174.2.0.dist-info}/top_level.txt +0 -0
@@ -41,7 +41,7 @@ class reductions_plafonnees(Variable):
41
41
  'ri_investissement_forestier',
42
42
  'location_meublee', # Censi-Bouvard, plafonnement approximatif
43
43
  'invlst', # Approximation
44
- 'invrev',
44
+ # 'invrev', #se termine en 2003
45
45
  'protection_patrimoine_naturel', # Approximation
46
46
  'rehab',
47
47
  'mohist',
@@ -563,7 +563,7 @@ class duflot_pinel_denormandie_metropole(Variable):
563
563
  f7ry = foyer_fiscal('f7ry', period) # Outre-Mer, 2015
564
564
 
565
565
  # Prorogation reports, 6 ans
566
- f7sx = foyer_fiscal('f7sx', period) # Métropole, 2014
566
+ f7sx = foyer_fiscal('f7sx_2022', period) # Métropole, 2014
567
567
 
568
568
  def calcul_reduction_investissement(cases):
569
569
  reduction = foyer_fiscal.empty_array()
@@ -2469,6 +2469,8 @@ class invrev(Variable):
2469
2469
 
2470
2470
 
2471
2471
  class location_meublee(Variable):
2472
+ # La disparition du dispositif Censi‑Bouvard au 31/12/2022 n'est pas rétroactive :
2473
+ # les opérations engagées avant cette date continuent à bénéficier des avantages du dispositif selon les règles en vigueur au moment de l'engagement.
2472
2474
  value_type = float
2473
2475
  entity = FoyerFiscal
2474
2476
  label = "Réduction d'impôt en faveur de l'acquisition de logements destinés à la location meublée non professionnelle - Dispositif Censi-Bouvard"
@@ -2683,11 +2685,11 @@ class location_meublee(Variable):
2683
2685
  f7jw = foyer_fiscal('f7jw', period)
2684
2686
  f7jx = foyer_fiscal('f7jx', period)
2685
2687
  f7jy = foyer_fiscal('f7jy', period)
2686
- f7oa = foyer_fiscal('f7oa', period)
2687
- f7ob = foyer_fiscal('f7ob', period)
2688
- f7oc = foyer_fiscal('f7oc', period)
2689
- f7od = foyer_fiscal('f7od', period)
2690
- f7oe = foyer_fiscal('f7oe', period)
2688
+ f7oa = foyer_fiscal('f7oa_2021', period)
2689
+ f7ob = foyer_fiscal('f7ob_2021', period)
2690
+ f7oc = foyer_fiscal('f7oc_2021', period)
2691
+ f7od = foyer_fiscal('f7od_2021', period)
2692
+ f7oe = foyer_fiscal('f7oe_2021', period)
2691
2693
  f7ou = foyer_fiscal('f7ou', period)
2692
2694
  f7pa = foyer_fiscal('f7pa', period)
2693
2695
  f7pb = foyer_fiscal('f7pb', period)
@@ -2772,11 +2774,11 @@ class location_meublee(Variable):
2772
2774
  f7jw = foyer_fiscal('f7jw', period)
2773
2775
  f7jx = foyer_fiscal('f7jx', period)
2774
2776
  f7jy = foyer_fiscal('f7jy', period)
2775
- f7oa = foyer_fiscal('f7oa', period)
2776
- f7ob = foyer_fiscal('f7ob', period)
2777
- f7oc = foyer_fiscal('f7oc', period)
2778
- f7od = foyer_fiscal('f7od', period)
2779
- f7oe = foyer_fiscal('f7oe', period)
2777
+ f7oa = foyer_fiscal('f7oa_2021', period)
2778
+ f7ob = foyer_fiscal('f7ob_2021', period)
2779
+ f7oc = foyer_fiscal('f7oc_2021', period)
2780
+ f7od = foyer_fiscal('f7od_2021', period)
2781
+ f7oe = foyer_fiscal('f7oe_2021', period)
2780
2782
  f7of = foyer_fiscal('f7of', period)
2781
2783
  f7og = foyer_fiscal('f7og', period)
2782
2784
  f7oh = foyer_fiscal('f7oh', period)
@@ -2873,11 +2875,11 @@ class location_meublee(Variable):
2873
2875
  f7jw = foyer_fiscal('f7jw', period)
2874
2876
  f7jx = foyer_fiscal('f7jx', period)
2875
2877
  f7jy = foyer_fiscal('f7jy', period)
2876
- f7oa = foyer_fiscal('f7oa', period)
2877
- f7ob = foyer_fiscal('f7ob', period)
2878
- f7oc = foyer_fiscal('f7oc', period)
2879
- f7od = foyer_fiscal('f7od', period)
2880
- f7oe = foyer_fiscal('f7oe', period)
2878
+ f7oa = foyer_fiscal('f7oa_2021', period)
2879
+ f7ob = foyer_fiscal('f7ob_2021', period)
2880
+ f7oc = foyer_fiscal('f7oc_2021', period)
2881
+ f7od = foyer_fiscal('f7od_2021', period)
2882
+ f7oe = foyer_fiscal('f7oe_2021', period)
2881
2883
  f7of = foyer_fiscal('f7of', period)
2882
2884
  f7og = foyer_fiscal('f7og', period)
2883
2885
  f7oh = foyer_fiscal('f7oh', period)
@@ -2972,11 +2974,11 @@ class location_meublee(Variable):
2972
2974
  f7jw = foyer_fiscal('f7jw', period)
2973
2975
  f7jx = foyer_fiscal('f7jx', period)
2974
2976
  f7jy = foyer_fiscal('f7jy', period)
2975
- f7oa = foyer_fiscal('f7oa', period)
2976
- f7ob = foyer_fiscal('f7ob', period)
2977
- f7oc = foyer_fiscal('f7oc', period)
2978
- f7od = foyer_fiscal('f7od', period)
2979
- f7oe = foyer_fiscal('f7oe', period)
2977
+ f7oa = foyer_fiscal('f7oa_2021', period)
2978
+ f7ob = foyer_fiscal('f7ob_2021', period)
2979
+ f7oc = foyer_fiscal('f7oc_2021', period)
2980
+ f7od = foyer_fiscal('f7od_2021', period)
2981
+ f7oe = foyer_fiscal('f7oe_2021', period)
2980
2982
  f7of = foyer_fiscal('f7of', period)
2981
2983
  f7og = foyer_fiscal('f7og', period)
2982
2984
  f7oh = foyer_fiscal('f7oh', period)
@@ -3099,11 +3101,11 @@ class location_meublee(Variable):
3099
3101
  f7jw = foyer_fiscal('f7jw', period)
3100
3102
  f7jx = foyer_fiscal('f7jx', period)
3101
3103
  f7jy = foyer_fiscal('f7jy', period)
3102
- f7oa = foyer_fiscal('f7oa', period)
3103
- f7ob = foyer_fiscal('f7ob', period)
3104
- f7oc = foyer_fiscal('f7oc', period)
3105
- f7od = foyer_fiscal('f7od', period)
3106
- f7oe = foyer_fiscal('f7oe', period)
3104
+ f7oa = foyer_fiscal('f7oa_2021', period)
3105
+ f7ob = foyer_fiscal('f7ob_2021', period)
3106
+ f7oc = foyer_fiscal('f7oc_2021', period)
3107
+ f7od = foyer_fiscal('f7od_2021', period)
3108
+ f7oe = foyer_fiscal('f7oe_2021', period)
3107
3109
  f7of = foyer_fiscal('f7of', period)
3108
3110
  f7og = foyer_fiscal('f7og', period)
3109
3111
  f7oh = foyer_fiscal('f7oh', period)
@@ -3227,11 +3229,11 @@ class location_meublee(Variable):
3227
3229
  f7jw = foyer_fiscal('f7jw', period)
3228
3230
  f7jx = foyer_fiscal('f7jx', period)
3229
3231
  f7jy = foyer_fiscal('f7jy', period)
3230
- f7oa = foyer_fiscal('f7oa', period)
3231
- f7ob = foyer_fiscal('f7ob', period)
3232
- f7oc = foyer_fiscal('f7oc', period)
3233
- f7od = foyer_fiscal('f7od', period)
3234
- f7oe = foyer_fiscal('f7oe', period)
3232
+ f7oa = foyer_fiscal('f7oa_2021', period)
3233
+ f7ob = foyer_fiscal('f7ob_2021', period)
3234
+ f7oc = foyer_fiscal('f7oc_2021', period)
3235
+ f7od = foyer_fiscal('f7od_2021', period)
3236
+ f7oe = foyer_fiscal('f7oe_2021', period)
3235
3237
  f7of = foyer_fiscal('f7of', period)
3236
3238
  f7og = foyer_fiscal('f7og', period)
3237
3239
  f7oh = foyer_fiscal('f7oh', period)
@@ -3366,8 +3368,8 @@ class location_meublee(Variable):
3366
3368
  'f7mz']
3367
3369
 
3368
3370
  rep = ['f7sp', 'f7sn', 'f7so', 'f7sa',
3369
- 'f7sb', 'f7sc', 'f7oa', 'f7ob',
3370
- 'f7oc', 'f7od', 'f7oe', 'f7of',
3371
+ 'f7sb', 'f7sc', 'f7oa_2021', 'f7ob_2021',
3372
+ 'f7oc_2021', 'f7od_2021', 'f7oe_2021', 'f7of',
3371
3373
  'f7og', 'f7oh', 'f7oi', 'f7oj',
3372
3374
  'f7ok', 'f7ol', 'f7om', 'f7on',
3373
3375
  'f7oo', 'f7op', 'f7oq', 'f7or',
@@ -3402,20 +3404,117 @@ class location_meublee(Variable):
3402
3404
  'f7mw']
3403
3405
 
3404
3406
  rep = ['f7sm', 'f7sp', 'f7sn', 'f7so', 'f7sa',
3405
- 'f7sb', 'f7sc', 'f7oa', 'f7ob',
3406
- 'f7oc', 'f7od', 'f7oe', 'f7of',
3407
+ 'f7sb', 'f7sc', 'f7oa_2021', 'f7ob_2021',
3408
+ 'f7oc_2021', 'f7od_2021', 'f7oe_2021', 'f7of',
3407
3409
  'f7og', 'f7oh', 'f7oi', 'f7oj',
3408
3410
  'f7ok', 'f7ol', 'f7om', 'f7on',
3409
3411
  'f7oo', 'f7op', 'f7oq', 'f7or',
3410
- 'f7os', 'f7ot', 'f7jv', 'f7jw',
3411
- 'f7jx', 'f7jy', 'f7pf', 'f7pg',
3412
- 'f7ph', 'f7pi', 'f7pj', 'f7pk',
3413
- 'f7pl', 'f7pm', 'f7pn', 'f7po',
3414
- 'f7pp', 'f7pq', 'f7pr', 'f7ps',
3415
- 'f7pt', 'f7pu', 'f7pv', 'f7pw',
3416
- 'f7px', 'f7py', 'f7ho', 'f7hp',
3417
- 'f7hq', 'f7hr', 'f7hs', 'f7ht',
3418
- 'f7hu', 'f7hv', 'f7hw', 'f7hx']
3412
+ 'f7os', 'f7ot', 'f7pk', 'f7pl',
3413
+ 'f7pm', 'f7pn', 'f7po', 'f7pp',
3414
+ 'f7pq', 'f7pr', 'f7ps', 'f7pt',
3415
+ 'f7pu', 'f7pv', 'f7pw', 'f7px',
3416
+ 'f7py', 'f7ho', 'f7hp', 'f7hq',
3417
+ 'f7hr', 'f7hs', 'f7ht', 'f7hu',
3418
+ 'f7hv', 'f7hw', 'f7hx', 'f7hd',
3419
+ 'f7he', 'f7hf', 'f7hg', 'f7hh']
3420
+
3421
+ rep_ri = sum([foyer_fiscal(r, period) for r in rep])
3422
+ inv_ri = sum([(P.taux11 * min_(P.plafond, foyer_fiscal(r, period)) / 9) for r in inv])
3423
+
3424
+ return rep_ri + inv_ri
3425
+
3426
+ def formula_2022_01_01(foyer_fiscal, period, parameters):
3427
+ '''
3428
+ Investissement en vue de la location meublée non professionnelle dans certains établissements ou résidences
3429
+ 2022
3430
+ '''
3431
+ P = parameters(period).impot_revenu.calcul_reductions_impots.location_meublee
3432
+
3433
+ inv = ['f7ow',
3434
+ 'f7ox',
3435
+ 'f7oy',
3436
+ 'f7pz',
3437
+ 'f7mz',
3438
+ 'f7mw',
3439
+ 'f7mn']
3440
+
3441
+ rep = ['f7ss', 'f7sm', 'f7sp', 'f7sn',
3442
+ 'f7so', 'f7sa', 'f7sb', 'f7sc',
3443
+ 'f7of', 'f7og', 'f7oh', 'f7oi',
3444
+ 'f7oj', 'f7ok', 'f7ol', 'f7om',
3445
+ 'f7on', 'f7oo', 'f7op', 'f7oq',
3446
+ 'f7or', 'f7os', 'f7ot', 'f7pp',
3447
+ 'f7pq', 'f7pr', 'f7ps', 'f7pt',
3448
+ 'f7pu', 'f7pv', 'f7pw', 'f7px',
3449
+ 'f7py', 'f7ho', 'f7hp', 'f7hq',
3450
+ 'f7hr', 'f7hs', 'f7ht', 'f7hu',
3451
+ 'f7hv', 'f7hw', 'f7hx', 'f7hd',
3452
+ 'f7he', 'f7hf', 'f7hg', 'f7hh',
3453
+ 'f7ke', 'f7kf', 'f7kg', 'f7kh',
3454
+ 'f7ki']
3455
+
3456
+ rep_ri = sum([foyer_fiscal(r, period) for r in rep])
3457
+ inv_ri = sum([(P.taux11 * min_(P.plafond, foyer_fiscal(r, period)) / 9) for r in inv])
3458
+
3459
+ return rep_ri + inv_ri
3460
+
3461
+ def formula_2023_01_01(foyer_fiscal, period, parameters):
3462
+ '''
3463
+ Investissement en vue de la location meublée non professionnelle dans certains établissements ou résidences
3464
+ 2023
3465
+ '''
3466
+ P = parameters(period).impot_revenu.calcul_reductions_impots.location_meublee
3467
+
3468
+ inv = ['f7ox',
3469
+ 'f7oy',
3470
+ 'f7pz',
3471
+ 'f7mz',
3472
+ 'f7mw',
3473
+ 'f7mn']
3474
+
3475
+ rep = ['f7st', 'f7ss', 'f7sm', 'f7sp',
3476
+ 'f7sn', 'f7so', 'f7sa', 'f7sb',
3477
+ 'f7sc', 'f7ok', 'f7ol', 'f7om',
3478
+ 'f7on', 'f7oo', 'f7op', 'f7oq',
3479
+ 'f7or', 'f7os', 'f7ot', 'f7pu',
3480
+ 'f7pv', 'f7pw', 'f7px',
3481
+ 'f7py', 'f7ho', 'f7hp', 'f7hq',
3482
+ 'f7hr', 'f7hs', 'f7ht', 'f7hu',
3483
+ 'f7hv', 'f7hw', 'f7hx', 'f7hd',
3484
+ 'f7he', 'f7hf', 'f7hg', 'f7hh',
3485
+ 'f7ke', 'f7kf', 'f7kg', 'f7kh',
3486
+ 'f7ki', 'f7oa', 'f7ob', 'f7oc',
3487
+ 'f7od', 'f7oe']
3488
+
3489
+ rep_ri = sum([foyer_fiscal(r, period) for r in rep])
3490
+ inv_ri = sum([(P.taux11 * min_(P.plafond, foyer_fiscal(r, period)) / 9) for r in inv])
3491
+
3492
+ return rep_ri + inv_ri
3493
+
3494
+ def formula_2024_01_01(foyer_fiscal, period, parameters):
3495
+ '''
3496
+ Investissement en vue de la location meublée non professionnelle dans certains établissements ou résidences
3497
+ 2024
3498
+ '''
3499
+ P = parameters(period).impot_revenu.calcul_reductions_impots.location_meublee
3500
+
3501
+ inv = ['f7oy',
3502
+ 'f7pz',
3503
+ 'f7mz',
3504
+ 'f7mw',
3505
+ 'f7mn']
3506
+
3507
+ rep = ['f7sx', 'f7st', 'f7ss', 'f7sm', 'f7sp',
3508
+ 'f7sn', 'f7so', 'f7sa', 'f7sb',
3509
+ 'f7sc', 'f7op', 'f7oq', 'f7or', 'f7os',
3510
+ 'f7ot', 'f7ho', 'f7hp', 'f7hq',
3511
+ 'f7hr', 'f7hs', 'f7ht', 'f7hu',
3512
+ 'f7hv', 'f7hw', 'f7hx', 'f7hd',
3513
+ 'f7he', 'f7hf', 'f7hg', 'f7hh',
3514
+ 'f7ke', 'f7kf', 'f7kg', 'f7kh',
3515
+ 'f7ki', 'f7oa', 'f7ob', 'f7oc',
3516
+ 'f7od', 'f7oe', 'f7po', 'f7pp',
3517
+ 'f7pq', 'f7pr', 'f7ps']
3419
3518
 
3420
3519
  rep_ri = sum([foyer_fiscal(r, period) for r in rep])
3421
3520
  inv_ri = sum([(P.taux11 * min_(P.plafond, foyer_fiscal(r, period)) / 9) for r in inv])
@@ -3506,7 +3605,7 @@ class protection_patrimoine_naturel(Variable):
3506
3605
  f7kb = foyer_fiscal('f7kb_2016', period)
3507
3606
  f7kc = foyer_fiscal('f7kc_2017', period)
3508
3607
  f7kd = foyer_fiscal('f7kd_2018', period)
3509
- f7ke = foyer_fiscal('f7ke', period)
3608
+ f7ke = foyer_fiscal('f7ke_2019', period)
3510
3609
 
3511
3610
  return f7kb + f7kc + f7kd + f7ke
3512
3611
 
@@ -3517,7 +3616,7 @@ class protection_patrimoine_naturel(Variable):
3517
3616
  '''
3518
3617
  f7kc = foyer_fiscal('f7kc_2017', period)
3519
3618
  f7kd = foyer_fiscal('f7kd_2018', period)
3520
- f7ke = foyer_fiscal('f7ke', period)
3619
+ f7ke = foyer_fiscal('f7ke_2019', period)
3521
3620
 
3522
3621
  return f7kc + f7kd + f7ke
3523
3622
 
@@ -3527,7 +3626,7 @@ class protection_patrimoine_naturel(Variable):
3527
3626
  2018
3528
3627
  '''
3529
3628
  f7kd = foyer_fiscal('f7kd_2018', period)
3530
- f7ke = foyer_fiscal('f7ke', period)
3629
+ f7ke = foyer_fiscal('f7ke_2019', period)
3531
3630
 
3532
3631
  return f7kd + f7ke
3533
3632
 
@@ -3536,7 +3635,7 @@ class protection_patrimoine_naturel(Variable):
3536
3635
  Dépenses de protections du patrimoine naturel (case 7KE)
3537
3636
  2019
3538
3637
  '''
3539
- f7ke = foyer_fiscal('f7ke', period)
3638
+ f7ke = foyer_fiscal('f7ke_2019', period)
3540
3639
 
3541
3640
  return f7ke
3542
3641
 
@@ -3662,7 +3761,7 @@ class ri_saldom(Variable):
3662
3761
 
3663
3762
  def formula_2011_01_01(foyer_fiscal, period, parameters):
3664
3763
  '''
3665
- Sommes versées pour l'emploi d'un salariés à domicile
3764
+ Sommes versées pour l'emploi d'un salarié à domicile
3666
3765
  2011 - 2016
3667
3766
  NB: Normalement, le plafond est aussi augmenté pour chaque personne
3668
3767
  agée de plus de 65 ans dans le foyer (en plus des PACs et des
@@ -3816,11 +3915,11 @@ class scelli(Variable):
3816
3915
  '''
3817
3916
  f7ha = foyer_fiscal('f7ha', period)
3818
3917
  f7hb = foyer_fiscal('f7hb', period)
3819
- f7hg = foyer_fiscal('f7hg', period)
3820
- f7hh = foyer_fiscal('f7hh', period)
3821
- f7hd = foyer_fiscal('f7hd', period)
3822
- f7he = foyer_fiscal('f7he', period)
3823
- f7hf = foyer_fiscal('f7hf', period)
3918
+ f7hg = foyer_fiscal('f7hg_2015', period)
3919
+ f7hh = foyer_fiscal('f7hh_2015', period)
3920
+ f7hd = foyer_fiscal('f7hd_2019', period)
3921
+ f7he = foyer_fiscal('f7he_2014', period)
3922
+ f7hf = foyer_fiscal('f7hf_2019', period)
3824
3923
  f7hj = foyer_fiscal('f7hj', period)
3825
3924
  f7hk = foyer_fiscal('f7hk', period)
3826
3925
  f7hl = foyer_fiscal('f7hl_2010', period)
@@ -3927,11 +4026,11 @@ class scelli(Variable):
3927
4026
  f7gx = foyer_fiscal('f7gx', period)
3928
4027
  f7ha = foyer_fiscal('f7ha', period)
3929
4028
  f7hb = foyer_fiscal('f7hb', period)
3930
- f7hg = foyer_fiscal('f7hg', period)
3931
- f7hh = foyer_fiscal('f7hh', period)
3932
- f7hd = foyer_fiscal('f7hd', period)
3933
- f7he = foyer_fiscal('f7he', period)
3934
- f7hf = foyer_fiscal('f7hf', period)
4029
+ f7hg = foyer_fiscal('f7hg_2015', period)
4030
+ f7hh = foyer_fiscal('f7hh_2015', period)
4031
+ f7hd = foyer_fiscal('f7hd_2019', period)
4032
+ f7he = foyer_fiscal('f7he_2014', period)
4033
+ f7hf = foyer_fiscal('f7hf_2019', period)
3935
4034
  f7hj = foyer_fiscal('f7hj', period)
3936
4035
  f7hk = foyer_fiscal('f7hk', period)
3937
4036
  f7hl = foyer_fiscal('f7hl_2010', period)
@@ -4045,11 +4144,11 @@ class scelli(Variable):
4045
4144
  f7gx = foyer_fiscal('f7gx', period)
4046
4145
  f7ha = foyer_fiscal('f7ha', period)
4047
4146
  f7hb = foyer_fiscal('f7hb', period)
4048
- f7hg = foyer_fiscal('f7hg', period)
4049
- f7hh = foyer_fiscal('f7hh', period)
4050
- f7hd = foyer_fiscal('f7hd', period)
4051
- f7he = foyer_fiscal('f7he', period)
4052
- f7hf = foyer_fiscal('f7hf', period)
4147
+ f7hg = foyer_fiscal('f7hg_2015', period)
4148
+ f7hh = foyer_fiscal('f7hh_2015', period)
4149
+ f7hd = foyer_fiscal('f7hd_2019', period)
4150
+ f7he = foyer_fiscal('f7he_2014', period)
4151
+ f7hf = foyer_fiscal('f7hf_2019', period)
4053
4152
  f7hj = foyer_fiscal('f7hj', period)
4054
4153
  f7hk = foyer_fiscal('f7hk', period)
4055
4154
  f7hl = foyer_fiscal('f7hl_2010', period)
@@ -4198,10 +4297,10 @@ class scelli(Variable):
4198
4297
  f7gw = foyer_fiscal('f7gw_2016', period)
4199
4298
  f7gx = foyer_fiscal('f7gx', period)
4200
4299
  f7ha = foyer_fiscal('f7ha', period)
4201
- f7hg = foyer_fiscal('f7hg', period)
4202
- f7hh = foyer_fiscal('f7hh', period)
4203
- f7hd = foyer_fiscal('f7hd', period)
4204
- f7hf = foyer_fiscal('f7hf', period)
4300
+ f7hg = foyer_fiscal('f7hg_2015', period)
4301
+ f7hh = foyer_fiscal('f7hh_2015', period)
4302
+ f7hd = foyer_fiscal('f7hd_2019', period)
4303
+ f7hf = foyer_fiscal('f7hf_2019', period)
4205
4304
  f7hj = foyer_fiscal('f7hj', period)
4206
4305
  f7hk = foyer_fiscal('f7hk', period)
4207
4306
  f7hl = foyer_fiscal('f7hl_2010', period)
@@ -4364,7 +4463,7 @@ class scelli(Variable):
4364
4463
  'f7gu', 'f7yh',
4365
4464
 
4366
4465
  'f7gv', 'f7yj', 'f7gw_2016', 'f7yk', 'f7gx', 'f7yl',
4367
- 'f7ha', 'f7hd', 'f7hf',
4466
+ 'f7ha', 'f7hd_2019', 'f7hf_2019',
4368
4467
 
4369
4468
  'f7lb_2016', 'f7le', 'f7lm_2018', 'f7ln', 'f7lg', 'f7lk',
4370
4469
  'f7lc_2016', 'f7ld', 'f7ls', 'f7lt', 'f7lh', 'f7ll',
@@ -4451,8 +4550,8 @@ class scelli(Variable):
4451
4550
  'f7ys', 'f7yz', 'f7wz',
4452
4551
  'f7gj', 'f7yb',
4453
4552
  'f7ha', 'f7gl', 'f7yd',
4454
- 'f7hd', 'f7gs', 'f7yf',
4455
- 'f7hf', 'f7gu', 'f7yh',
4553
+ 'f7hd_2019', 'f7gs', 'f7yf',
4554
+ 'f7hf_2019', 'f7gu', 'f7yh',
4456
4555
  'f7yj', 'f7yk', 'f7yl',
4457
4556
  'f7le', 'f7lm_2018', 'f7ln', 'f7lg', 'f7lk', 'f7lq',
4458
4557
  'f7ld', 'f7ls', 'f7lt', 'f7lh', 'f7ll', 'f7lr',
@@ -4545,8 +4644,8 @@ class scelli(Variable):
4545
4644
 
4546
4645
  'f7gj', 'f7yb',
4547
4646
  'f7ha', 'f7gl', 'f7yd',
4548
- 'f7hd', 'f7gs', 'f7yf',
4549
- 'f7hf', 'f7gu', 'f7yh',
4647
+ 'f7hd_2019', 'f7gs', 'f7yf',
4648
+ 'f7hf_2019', 'f7gu', 'f7yh',
4550
4649
 
4551
4650
  'f7lm_2018', 'f7ln', 'f7lg', 'f7lk', 'f7lq', 'f7la',
4552
4651
  'f7ls', 'f7lt', 'f7lh', 'f7ll', 'f7lr', 'f7lb',
@@ -4631,8 +4730,8 @@ class scelli(Variable):
4631
4730
  'f7yz', 'f7wz',
4632
4731
 
4633
4732
  'f7gj', 'f7yb', 'f7ha', 'f7gl',
4634
- 'f7yd', 'f7hd', 'f7gs', 'f7yf',
4635
- 'f7hf', 'f7gu', 'f7yh',
4733
+ 'f7yd', 'f7hd_2019', 'f7gs', 'f7yf',
4734
+ 'f7hf_2019', 'f7gu', 'f7yh',
4636
4735
 
4637
4736
  'f7ln', 'f7lg', 'f7lk', 'f7lq',
4638
4737
  'f7la', 'f7ms', 'f7lt', 'f7lh',