OpenFisca-France 161.0.3__py3-none-any.whl → 169.14.7__py3-none-any.whl

openfisca_france/model/prelevements_obligatoires/impot_revenu/reductions_impot_plafonnees.py

@@ -208,16 +208,16 @@ class duflot_pinel_denormandie_metropole(Variable):
         '''
         Duflot
         '''
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
+        reduction = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
 
         # Duflot année N, 2013
         f7gh = foyer_fiscal('f7gh', period)  # Métropole
         f7gi = foyer_fiscal('f7gi', period)  # Outre-Mer
 
-        inv_om = min_(P.plafond, f7gi)
-        inv_metro = min_(P.plafond - inv_om, f7gh)
+        inv_om = min_(reduction.plafond, f7gi)
+        inv_metro = min_(reduction.plafond - inv_om, f7gh)
 
-        ri_metro = around(inv_metro * P.taux_duflot_metro / 9)
+        ri_metro = around(inv_metro * reduction.location_9_ans.taux_metro / 9)
 
         return ri_metro
 
@@ -228,7 +228,7 @@ class duflot_pinel_denormandie_metropole(Variable):
         even though they may contain OM investments as well (only relevant after 2015,
         but since there are no separate cases, nothing one can potentially do).
         '''
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
+        duflot_pinel_denormandie = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
 
         # Duflot année N, 2013
         f7gh = foyer_fiscal('f7gh', period)  # Métropole
@@ -249,13 +249,13 @@ class duflot_pinel_denormandie_metropole(Variable):
 
         # Duflot 2013
 
-        reduc_2013 = around(P.taux_duflot_metro * min_(P.plafond - f7gi, f7gh) / 9)
+        reduc_2013 = around(duflot_pinel_denormandie.location_9_ans.taux_metro * min_(duflot_pinel_denormandie.plafond - f7gi, f7gh) / 9)
 
         # Duflot et Pinel 2014
-        max1 = max_(0, P.plafond - f7el - f7qd - f7qc)  # 2014 : plafond commun 'duflot' et 'rpinel'
+        max1 = max_(0, duflot_pinel_denormandie.plafond - f7el - f7qd - f7qc)  # 2014 : plafond commun 'duflot' et 'rpinel'
 
-        reduc_2014 = (around(P.taux_duflot_metro * min_(max1, f7ek + f7qb) / 9)
-            + around(P.taux_pinel_denormandie_metro_6ans * min_(max1 - f7ek - f7qb, f7qa) / 6))
+        reduc_2014 = (around(duflot_pinel_denormandie.location_9_ans.taux_metro * min_(max1, f7ek + f7qb) / 9)
+            + around(duflot_pinel_denormandie.location_6_ans.taux_metro * min_(max1 - f7ek - f7qb, f7qa) / 6))
 
         ri_metro = reduc_2013 + reduc_2014 + f7fi
 
@@ -266,7 +266,7 @@ class duflot_pinel_denormandie_metropole(Variable):
         Investissement locatif privé - Dispositif Pinel
         De 2015 à 2018
         '''
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
+        duflot_pinel_denormandie = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
 
         # Duflot année N, 2013
         f7gh = foyer_fiscal('f7gh', period)  # Métropole
@@ -320,13 +320,13 @@ class duflot_pinel_denormandie_metropole(Variable):
             }
 
         # Duflot 2013
-        reduc_2013 = around(P.taux_duflot_metro * min_(P.plafond - f7gi, f7gh) / 9)
+        reduc_2013 = around(duflot_pinel_denormandie.location_9_ans.taux_metro * min_(duflot_pinel_denormandie.plafond - f7gi, f7gh) / 9)
 
         # Duflot et Pinel 2014
-        max1 = max_(0, P.plafond - f7el - f7qd - f7qc)  # 2014 : plafond commun 'duflot' et 'rpinel'
+        max1 = max_(0, duflot_pinel_denormandie.plafond - f7el - f7qd - f7qc)  # 2014 : plafond commun 'duflot' et 'rpinel'
 
-        reduc_2014 = (around(P.taux_duflot_metro * min_(max1, f7ek + f7qb) / 9)
-            + around(P.taux_pinel_denormandie_metro_6ans * min_(max1 - f7ek - f7qb, f7qa) / 6))
+        reduc_2014 = (around(duflot_pinel_denormandie.location_9_ans.taux_metro * min_(max1, f7ek + f7qb) / 9)
+            + around(duflot_pinel_denormandie.location_6_ans.taux_metro * min_(max1 - f7ek - f7qb, f7qa) / 6))
 
         def calcul_reduction_investissement(cases):
             reduction = foyer_fiscal.empty_array()
@@ -336,9 +336,9 @@ class duflot_pinel_denormandie_metropole(Variable):
                 depense = foyer_fiscal(variable, period)
                 if zone == 'metropole':
                     if duree == 9:
-                        reduction += around(P.taux_pinel_denormandie_metro_9ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_9_ans.taux_metro * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                     elif duree == 6:
-                        reduction += around(P.taux_pinel_denormandie_metro_6ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_6_ans.taux_metro * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                 depenses_cumulees += depense
             return reduction
 
@@ -355,7 +355,7 @@ class duflot_pinel_denormandie_metropole(Variable):
         '''
         Duflot + Pinel + Denormandie
         '''
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
+        duflot_pinel_denormandie = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
 
         cases_investissement = {
             2019: [  # A compter de 2019, le plafonnement de la base de calcul est commun à tous les investissements réalisés
@@ -405,9 +405,9 @@ class duflot_pinel_denormandie_metropole(Variable):
                 depense = foyer_fiscal(variable, period)
                 if zone == 'metropole':
                     if duree == 9:
-                        reduction += around(P.taux_pinel_denormandie_metro_9ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_9_ans.taux_metro * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                     elif duree == 6:
-                        reduction += around(P.taux_pinel_denormandie_metro_6ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_6_ans.taux_metro * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                 depenses_cumulees += depense
             return reduction
 
@@ -426,7 +426,7 @@ class duflot_pinel_denormandie_metropole(Variable):
         NB: it is not clear whether the extension of the Pinel investment should also
         count towards the ceiling of € 300K. I will assume it does.
         '''
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
+        duflot_pinel_denormandie = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
         cases_investissement = {
             2019: [  # A compter de 2019, le plafonnement de la base de calcul est commun à tous les investissements réalisés
                 ('f7qp', 9, 'outremer'),  # Pinel 2017
@@ -484,9 +484,9 @@ class duflot_pinel_denormandie_metropole(Variable):
                 depense = foyer_fiscal(variable, period)
                 if zone == 'metropole':
                     if duree == 9:
-                        reduction += around(P.taux_pinel_denormandie_metro_9ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_9_ans.taux_metro * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                     elif duree == 6:
-                        reduction += around(P.taux_pinel_denormandie_metro_6ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_6_ans.taux_metro * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                 depenses_cumulees += depense
             return reduction
 
@@ -497,7 +497,7 @@ class duflot_pinel_denormandie_metropole(Variable):
         reduction_cumulee = sum([calcul_reduction_investissement(cases_investissement[year]) for year in range_year_investissement])
         report = sum([foyer_fiscal(case, period) for year in range_year_report for case in cases_report[year]])
 
-        prorogation = around(min_(P.plafond - f7rs, f7rr) * P.taux_prolong1_6ans / 3)
+        prorogation = around(min_(duflot_pinel_denormandie.plafond - f7rs, f7rr) * duflot_pinel_denormandie.taux_prolongation.taux_prolong1_6ans / 3)
 
         return reduction_cumulee + report + f7fi + f7fk + f7fr + f7fv + f7fw + f7fx + prorogation
 
@@ -505,7 +505,7 @@ class duflot_pinel_denormandie_metropole(Variable):
         '''
         Duflot + Pinel + Denormandie
         '''
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
+        duflot_pinel_denormandie = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
         cases_investissement = {
             2019: [  # A compter de 2019, le plafonnement de la base de calcul est commun à tous les investissements réalisés
                 ('f7qu', 9, 'outremer'),
@@ -573,9 +573,9 @@ class duflot_pinel_denormandie_metropole(Variable):
                 depense = foyer_fiscal(variable, period)
                 if zone == 'metropole':
                     if duree == 9:
-                        reduction += around(P.taux_pinel_denormandie_metro_9ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_9_ans.taux_metro * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                     elif duree == 6:
-                        reduction += around(P.taux_pinel_denormandie_metro_6ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_6_ans.taux_metro * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                 depenses_cumulees += depense
             return reduction
 
@@ -586,8 +586,8 @@ class duflot_pinel_denormandie_metropole(Variable):
         reduction_cumulee = sum([calcul_reduction_investissement(cases_investissement[year]) for year in range_year_investissement])
         report = sum([foyer_fiscal(case, period) for year in range_year_report for case in cases_report[year]])
 
-        prorogation = (around(min_(P.plafond - f7rs, f7rr) * P.taux_prolong1_6ans / 3)
-            + around(min_(P.plafond - f7ry, f7rx) * P.taux_prolong1_6ans / 3))
+        prorogation = (around(min_(duflot_pinel_denormandie.plafond - f7rs, f7rr) * duflot_pinel_denormandie.taux_prolongation.taux_prolong1_6ans / 3)
+            + around(min_(duflot_pinel_denormandie.plafond - f7ry, f7rx) * duflot_pinel_denormandie.taux_prolongation.taux_prolong1_6ans / 3))
 
         return reduction_cumulee + report + f7fi + f7fk + f7fr + f7fv + f7fw + f7fx + prorogation + f7sx
 
@@ -602,14 +602,14 @@ class duflot_pinel_denormandie_om(Variable):
         '''
         Duflot
         '''
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
+        duflot_pinel_denormandie = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
 
         # Duflot année N, 2013
         f7gi = foyer_fiscal('f7gi', period)  # Outre-Mer
 
-        inv_om = min_(P.plafond, f7gi)
+        inv_om = min_(duflot_pinel_denormandie.plafond, f7gi)
 
-        ri_om = around(inv_om * P.taux_duflot_om / 9)
+        ri_om = around(inv_om * duflot_pinel_denormandie.location_9_ans.taux_om / 9)
 
         return ri_om
 
@@ -620,7 +620,7 @@ class duflot_pinel_denormandie_om(Variable):
         even though they may contain OM investments as well (only relevant after 2015,
         but since there are no separate cases, nothing one can potentially do).
         '''
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
+        duflot_pinel_denormandie = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
 
         # Duflot année N, 2013
         f7gi = foyer_fiscal('f7gi', period)  # Outre-Mer
@@ -633,14 +633,14 @@ class duflot_pinel_denormandie_om(Variable):
         f7qd = foyer_fiscal('f7qd_2018', period)  # Outre-Mer, 9 ans
 
         # Duflot 2013
-        reduc_2013 = around(P.taux_duflot_om * min_(P.plafond, f7gi) / 9)
+        reduc_2013 = around(duflot_pinel_denormandie.location_9_ans.taux_om * min_(duflot_pinel_denormandie.plafond, f7gi) / 9)
 
         # Duflot et Pinel 2014
-        inv_29_om = min_(P.plafond, f7el + f7qd)
-        inv_23_om = min_(P.plafond - inv_29_om, f7qc)
+        inv_29_om = min_(duflot_pinel_denormandie.plafond, f7el + f7qd)
+        inv_23_om = min_(duflot_pinel_denormandie.plafond - inv_29_om, f7qc)
 
-        reduc = (around((inv_29_om * P.taux_duflot_om / 9)
-            + around(inv_23_om * P.taux_pinel_denormandie_om_6ans / 6))) + reduc_2013
+        reduc = (around((inv_29_om * duflot_pinel_denormandie.location_9_ans.taux_om / 9)
+            + around(inv_23_om * duflot_pinel_denormandie.location_6_ans.taux_om / 6))) + reduc_2013
 
         return reduc
 
@@ -648,7 +648,7 @@ class duflot_pinel_denormandie_om(Variable):
         '''
         Duflot + Pinel
         '''
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
+        duflot_pinel_denormandie = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
 
         # Duflot année N, 2013
         f7gi = foyer_fiscal('f7gi', period)  # Outre-Mer
@@ -661,11 +661,11 @@ class duflot_pinel_denormandie_om(Variable):
         f7qd = foyer_fiscal('f7qd_2018', period)  # Outre-Mer, 9 ans
 
         # Duflot 2013
-        reduc_2013 = P.taux_duflot_om * min_(P.plafond, f7gi) / 9
+        reduc_2013 = duflot_pinel_denormandie.location_9_ans.taux_om * min_(duflot_pinel_denormandie.plafond, f7gi) / 9
 
         # Duflot et Pinel 2014
-        reduc_2014 = (around(P.taux_duflot_om * min_(P.plafond, f7el + f7qd) / 9)
-            + around(P.taux_pinel_denormandie_om_6ans * min_(P.plafond - f7el - f7qd, f7qc) / 6))
+        reduc_2014 = (around(duflot_pinel_denormandie.location_9_ans.taux_om * min_(duflot_pinel_denormandie.plafond, f7el + f7qd) / 9)
+            + around(duflot_pinel_denormandie.location_6_ans.taux_om * min_(duflot_pinel_denormandie.plafond - f7el - f7qd, f7qc) / 6))
 
         cases_investissement = {
             2015: [
@@ -705,9 +705,9 @@ class duflot_pinel_denormandie_om(Variable):
                 depense = foyer_fiscal(variable, period)
                 if zone == 'outremer':
                     if duree == 9:
-                        reduction += around(P.taux_pinel_denormandie_om_9ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_9_ans.taux_om * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                     elif duree == 6:
-                        reduction += around(P.taux_pinel_denormandie_om_6ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_6_ans.taux_om * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                 depenses_cumulees += depense
             return reduction
 
@@ -724,7 +724,7 @@ class duflot_pinel_denormandie_om(Variable):
         '''
         Duflot + Pinel + Denormandie
         '''
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
+        duflot_pinel_denormandie = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
 
         cases_investissement = {
             2019: [  # A compter de 2019, le plafonnement de la base de calcul est commun à tous les investissements réalisés
@@ -766,9 +766,9 @@ class duflot_pinel_denormandie_om(Variable):
                 depense = foyer_fiscal(variable, period)
                 if zone == 'outremer':
                     if duree == 9:
-                        reduction += around(P.taux_pinel_denormandie_om_9ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_9_ans.taux_om * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                     elif duree == 6:
-                        reduction += around(P.taux_pinel_denormandie_om_6ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_6_ans.taux_om * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                 depenses_cumulees += depense
             return reduction
 
@@ -787,7 +787,7 @@ class duflot_pinel_denormandie_om(Variable):
         NB: it is not clear whether the extension of the Pinel investment should also
         count towards the ceiling of € 300K. I will assume it does.
         '''
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
+        duflot_pinel_denormandie = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
 
         cases_investissement = {
             2019: [  # A compter de 2019, le plafonnement de la base de calcul est commun à tous les investissements réalisés
@@ -837,9 +837,9 @@ class duflot_pinel_denormandie_om(Variable):
                 depense = foyer_fiscal(variable, period)
                 if zone == 'outremer':
                     if duree == 9:
-                        reduction += around(P.taux_pinel_denormandie_om_9ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_9_ans.taux_om * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                     elif duree == 6:
-                        reduction += around(P.taux_pinel_denormandie_om_6ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_6_ans.taux_om * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                 depenses_cumulees += depense
             return reduction
 
@@ -850,7 +850,7 @@ class duflot_pinel_denormandie_om(Variable):
         reduction_cumulee = sum([calcul_reduction_investissement(cases_investissement[year]) for year in range_year_investissement])
         report = sum([foyer_fiscal(case, period) for year in range_year_report for case in cases_report[year]])
 
-        prorogation = around(min_(P.plafond, f7rs) * P.taux_prolong1_6ans / 3)
+        prorogation = around(min_(duflot_pinel_denormandie.plafond, f7rs) * duflot_pinel_denormandie.taux_prolongation.taux_prolong1_6ans / 3)
 
         return reduction_cumulee + report + prorogation
 
@@ -858,7 +858,7 @@ class duflot_pinel_denormandie_om(Variable):
         '''
         Duflot + Pinel + Denormandie
         '''
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
+        duflot_pinel_denormandie = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.duflot_pinel_denormandie
 
         cases_investissement = {
             2019: [  # A compter de 2019, le plafonnement de la base de calcul est commun à tous les investissements réalisés
@@ -916,9 +916,9 @@ class duflot_pinel_denormandie_om(Variable):
                 depense = foyer_fiscal(variable, period)
                 if zone == 'outremer':
                     if duree == 9:
-                        reduction += around(P.taux_pinel_denormandie_om_9ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_9_ans.taux_om * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                     elif duree == 6:
-                        reduction += around(P.taux_pinel_denormandie_om_6ans * min_(max_(0, P.plafond - depenses_cumulees), depense) / duree)
+                        reduction += around(duflot_pinel_denormandie.location_6_ans.taux_om * min_(max_(0, duflot_pinel_denormandie.plafond - depenses_cumulees), depense) / duree)
                 depenses_cumulees += depense
             return reduction
 
@@ -929,8 +929,8 @@ class duflot_pinel_denormandie_om(Variable):
         reduction_cumulee = sum([calcul_reduction_investissement(cases_investissement[year]) for year in range_year_investissement])
         report = sum([foyer_fiscal(case, period) for year in range_year_report for case in cases_report[year]])
 
-        prorogation = (around(min_(P.plafond, f7rs) * P.taux_prolong1_6ans / 3)
-            + around(min_(P.plafond, f7ry) * P.taux_prolong1_6ans / 3))
+        prorogation = (around(min_(duflot_pinel_denormandie.plafond, f7rs) * duflot_pinel_denormandie.taux_prolongation.taux_prolong1_6ans / 3)
+            + around(min_(duflot_pinel_denormandie.plafond, f7ry) * duflot_pinel_denormandie.taux_prolongation.taux_prolong1_6ans / 3))
 
         return reduction_cumulee + report + prorogation + f7sy
 
@@ -1028,7 +1028,7 @@ class cappme(Variable):
         f7cl = foyer_fiscal('f7cl', period)
         f7cm = foyer_fiscal('f7cm', period)
         f7cn = foyer_fiscal('f7cn', period)
-        f7cq = foyer_fiscal('f7cq', period)
+        f7cq = foyer_fiscal('f7cq_2012', period)
         f7cu = foyer_fiscal('f7cu', period)
         P = parameters(period).impot_revenu.calcul_reductions_impots.souscriptions.pme.souscription_capital
 
@@ -1047,15 +1047,15 @@ class cappme(Variable):
         f7cl = foyer_fiscal('f7cl', period)
         f7cm = foyer_fiscal('f7cm', period)
         f7cn = foyer_fiscal('f7cn', period)
-        f7cq = foyer_fiscal('f7cq', period)
+        f7cq = foyer_fiscal('f7cq_2012', period)
         f7cu = foyer_fiscal('f7cu', period)
         P = parameters(period).impot_revenu.calcul_reductions_impots.souscriptions.pme.souscription_capital
 
         # TODO: gérer les changements de situation familiale
         base = f7cl + f7cm + f7cn
         seuil1 = P.seuil * (maries_ou_pacses + 1)
-        seuil2 = max_(0, P.seuil_tpe * (maries_ou_pacses + 1) - min_(base, seuil1) - min_(f7cq, seuil1) - min_(f7cu, seuil1))
-        seuil3 = min_(P.seuil_tpe * (maries_ou_pacses + 1) - min_(base, seuil1) - min_(f7cq, seuil1), seuil1)
+        seuil2 = max_(0, P.seuil * (maries_ou_pacses + 1) - min_(base, seuil1) - min_(f7cq, seuil1) - min_(f7cu, seuil1))
+        seuil3 = min_(P.seuil * (maries_ou_pacses + 1) - min_(base, seuil1) - min_(f7cq, seuil1), seuil1)
 
         return (
             P.taux25 * min_(base, seuil1)
@@ -1080,8 +1080,8 @@ class cappme(Variable):
 
         base = f7cl + f7cm
         seuil1 = P.seuil * (maries_ou_pacses + 1)
-        seuil2 = max_(0, P.seuil_tpe * (maries_ou_pacses + 1) - min_(base, seuil1) - min_(f7cn, seuil1) - min_(f7cu, seuil1))
-        seuil3 = min_(P.seuil_tpe * (maries_ou_pacses + 1) - min_(base, seuil1) - min_(f7cq, seuil1), seuil1)
+        seuil2 = max_(0, P.seuil * (maries_ou_pacses + 1) - min_(base, seuil1) - min_(f7cn, seuil1) - min_(f7cu, seuil1))
+        seuil3 = min_(P.seuil * (maries_ou_pacses + 1) - min_(base, seuil1) - min_(f7cq, seuil1), seuil1)
 
         return (
             P.taux25 * min_(base, seuil1)
@@ -1106,27 +1106,26 @@ class cappme(Variable):
         report_cappme_2013_plaf_general = foyer_fiscal('f7cy', period)
         P = parameters(period).impot_revenu.calcul_reductions_impots.souscriptions.pme.souscription_capital
 
-        seuil1 = P.seuil * (maries_ou_pacses + 1)
-        seuil2 = P.seuil_tpe * (maries_ou_pacses + 1)
+        seuil = P.seuil * (maries_ou_pacses + 1)
 
         # Réduction investissement PME : imputation du plus ancien au plus récent
-        base_report_cappme_2010_PME = min_(f7cl, seuil1)
-        base_report_cappme_2011_PME = max_(0, min_(f7cm, seuil1) - base_report_cappme_2010_PME)
-        base_report_cappme_2012_PME = max_(0, min_(f7cn, seuil1 - base_report_cappme_2010_PME - base_report_cappme_2011_PME))
-        base_report_cappme_2013_PME = max_(0, min_(f7cc, seuil1 - base_report_cappme_2010_PME - base_report_cappme_2011_PME - base_report_cappme_2012_PME))
-        base_cappme_2014_PME = max_(0, min_(f7cu, seuil1 - base_report_cappme_2010_PME - base_report_cappme_2011_PME - base_report_cappme_2012_PME - base_report_cappme_2013_PME))
+        base_report_cappme_2010_PME = min_(f7cl, seuil)
+        base_report_cappme_2011_PME = max_(0, min_(f7cm, seuil) - base_report_cappme_2010_PME)
+        base_report_cappme_2012_PME = max_(0, min_(f7cn, seuil - base_report_cappme_2010_PME - base_report_cappme_2011_PME))
+        base_report_cappme_2013_PME = max_(0, min_(f7cc, seuil - base_report_cappme_2010_PME - base_report_cappme_2011_PME - base_report_cappme_2012_PME))
+        base_cappme_2014_PME = max_(0, min_(f7cu, seuil - base_report_cappme_2010_PME - base_report_cappme_2011_PME - base_report_cappme_2012_PME - base_report_cappme_2013_PME))
 
         # Réduction investissement TPE : imputation du plus ancien au plus récent
-        base_report_cappme_2012_TPE = min_(f7cq, seuil2)
-        base_report_cappme_2013_TPE = max_(0, min_(f7cr, seuil2 - base_report_cappme_2012_TPE))
-        base_cappme_2014_TPE = max_(0, min_(f7cf, seuil2 - base_report_cappme_2012_TPE - base_report_cappme_2013_TPE))
+        base_report_cappme_2012_TPE = min_(f7cq, seuil)
+        base_report_cappme_2013_TPE = max_(0, min_(f7cr, seuil - base_report_cappme_2012_TPE))
+        base_cappme_2014_TPE = max_(0, min_(f7cf, seuil - base_report_cappme_2012_TPE - base_report_cappme_2013_TPE))
 
-        seuil3 = seuil2 - min_(seuil2, base_report_cappme_2010_PME)
+        seuil3 = seuil - min_(seuil, base_report_cappme_2010_PME)
         seuil4 = seuil3 - min_(seuil3, base_report_cappme_2010_PME + base_report_cappme_2011_PME)
 
         return (
             report_cappme_2013_plaf_general
-            + min_(seuil2, base_report_cappme_2010_PME) * P.taux25
+            + min_(seuil, base_report_cappme_2010_PME) * P.taux25
             + min_(seuil3, base_report_cappme_2011_PME) * P.taux22
             + min_(
                 seuil4,
@@ -1158,31 +1157,30 @@ class cappme(Variable):
         f7dy = foyer_fiscal('f7dy', period)
         P = parameters(period).impot_revenu.calcul_reductions_impots.souscriptions.pme.souscription_capital
 
-        seuil1 = P.seuil * (maries_ou_pacses + 1)
-        seuil2 = P.seuil_tpe * (maries_ou_pacses + 1)
+        seuil = P.seuil * (maries_ou_pacses + 1)
 
         # Réduction investissement PME : imputation du plus ancien au plus récent
-        base_report_cappme_2011_PME = min_(f7cl, seuil1)
-        base_report_cappme_2012_PME = max_(0, min_(f7cm, seuil1) - base_report_cappme_2011_PME)
-        base_report_cappme_2013_PME = max_(0, min_(f7cn, seuil1 - base_report_cappme_2011_PME - base_report_cappme_2012_PME))
-        base_report_cappme_2014_PME = max_(0, min_(f7cc, seuil1 - base_report_cappme_2011_PME - base_report_cappme_2012_PME - base_report_cappme_2013_PME))
-        base_cappme_2015_PME = max_(0, min_(f7cu, seuil1 - base_report_cappme_2011_PME - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME))
+        base_report_cappme_2011_PME = min_(f7cl, seuil)
+        base_report_cappme_2012_PME = max_(0, min_(f7cm, seuil) - base_report_cappme_2011_PME)
+        base_report_cappme_2013_PME = max_(0, min_(f7cn, seuil - base_report_cappme_2011_PME - base_report_cappme_2012_PME))
+        base_report_cappme_2014_PME = max_(0, min_(f7cc, seuil - base_report_cappme_2011_PME - base_report_cappme_2012_PME - base_report_cappme_2013_PME))
+        base_cappme_2015_PME = max_(0, min_(f7cu, seuil - base_report_cappme_2011_PME - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME))
 
         # Réduction investissement TPE : imputation du plus ancien au plus récent
-        base_report_cappme_2012_TPE = min_(f7cq, seuil2)
-        base_report_cappme_2013_TPE = max_(0, min_(f7cr, seuil2 - base_report_cappme_2012_TPE))
-        base_report_cappme_2014_TPE = max_(0, min_(f7cv, seuil2 - base_report_cappme_2012_TPE - base_report_cappme_2013_TPE))
-        base_cappme_2015_TPE = max_(0, min_(f7cf, seuil2 - base_report_cappme_2012_TPE - base_report_cappme_2013_TPE - base_report_cappme_2014_TPE))
+        base_report_cappme_2012_TPE = min_(f7cq, seuil)
+        base_report_cappme_2013_TPE = max_(0, min_(f7cr, seuil - base_report_cappme_2012_TPE))
+        base_report_cappme_2014_TPE = max_(0, min_(f7cv, seuil - base_report_cappme_2012_TPE - base_report_cappme_2013_TPE))
+        base_cappme_2015_TPE = max_(0, min_(f7cf, seuil - base_report_cappme_2012_TPE - base_report_cappme_2013_TPE - base_report_cappme_2014_TPE))
 
         report_cappme_2013_plaf_general = f7cy
         report_cappme_2014_plaf_general = f7dy
 
-        seuil3 = seuil2 - min_(seuil2, base_report_cappme_2011_PME)
+        seuil3 = seuil - min_(seuil, base_report_cappme_2011_PME)
 
         return (
             report_cappme_2013_plaf_general
             + report_cappme_2014_plaf_general
-            + P.taux22 * min_(seuil2, base_report_cappme_2011_PME)
+            + P.taux22 * min_(seuil, base_report_cappme_2011_PME)
             + P.taux18 * min_(
                 seuil3,
                 base_report_cappme_2012_PME
@@ -1222,22 +1220,21 @@ class cappme(Variable):
 
         P = parameters(period).impot_revenu.calcul_reductions_impots.souscriptions.pme.souscription_capital
 
-        seuil1 = P.seuil * (maries_ou_pacses + 1)
-        seuil2 = P.seuil_tpe * (maries_ou_pacses + 1)
+        seuil = P.seuil * (maries_ou_pacses + 1)
 
         # Réduction investissement PME : imputation du plus ancien au plus récent
-        base_report_cappme_2012_PME = min_(f7cl, seuil1)
-        base_report_cappme_2013_PME = max_(0, min_(f7cm, seuil1 - base_report_cappme_2012_PME))
-        base_report_cappme_2014_PME = max_(0, min_(f7cn, seuil1 - base_report_cappme_2012_PME - base_report_cappme_2013_PME))
-        base_report_cappme_2015_PME = max_(0, min_(f7cc, seuil1 - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME))
-        base_cappme_2016_PME = max_(0, min_(f7cu, seuil1 - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME))
+        base_report_cappme_2012_PME = min_(f7cl, seuil)
+        base_report_cappme_2013_PME = max_(0, min_(f7cm, seuil - base_report_cappme_2012_PME))
+        base_report_cappme_2014_PME = max_(0, min_(f7cn, seuil - base_report_cappme_2012_PME - base_report_cappme_2013_PME))
+        base_report_cappme_2015_PME = max_(0, min_(f7cc, seuil - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME))
+        base_cappme_2016_PME = max_(0, min_(f7cu, seuil - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME))
 
         # Réduction investissement TPE : imputation du plus ancien au plus récent
-        base_report_cappme_2012_TPE = min_(f7cq, seuil2 - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME)
-        base_report_cappme_2013_TPE = max_(0, min_(f7cr, seuil2 - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2012_TPE))
-        base_report_cappme_2014_TPE = max_(0, min_(f7cv, seuil2 - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2012_TPE - base_report_cappme_2013_TPE))
-        base_report_cappme_2015_TPE = max_(0, min_(f7cx, seuil2 - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2012_TPE - base_report_cappme_2013_TPE - base_report_cappme_2014_TPE))
-        base_cappme_2016_TPE = max_(0, min_(f7cf, seuil2 - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2012_TPE - base_report_cappme_2013_TPE - base_report_cappme_2014_TPE - base_report_cappme_2015_TPE))
+        base_report_cappme_2012_TPE = min_(f7cq, seuil - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME)
+        base_report_cappme_2013_TPE = max_(0, min_(f7cr, seuil - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2012_TPE))
+        base_report_cappme_2014_TPE = max_(0, min_(f7cv, seuil - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2012_TPE - base_report_cappme_2013_TPE))
+        base_report_cappme_2015_TPE = max_(0, min_(f7cx, seuil - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2012_TPE - base_report_cappme_2013_TPE - base_report_cappme_2014_TPE))
+        base_cappme_2016_TPE = max_(0, min_(f7cf, seuil - base_report_cappme_2012_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2012_TPE - base_report_cappme_2013_TPE - base_report_cappme_2014_TPE - base_report_cappme_2015_TPE))
 
         reports_plaf_general = f7cy + f7dy + f7ey
 
@@ -1281,23 +1278,22 @@ class cappme(Variable):
 
         P = parameters(period).impot_revenu.calcul_reductions_impots.souscriptions.pme.souscription_capital
 
-        plafond_PME = P.seuil * (maries_ou_pacses + 1)
-        plafond_TPE = P.seuil_tpe * (maries_ou_pacses + 1)
+        plafond = P.seuil * (maries_ou_pacses + 1)
 
         # Réduction investissement PME (souscription avant 2012) : imputation du plus ancien au plus récent
-        base_report_cappme_2013_PME = min_(f7cl, plafond_PME)
-        base_report_cappme_2014_PME = max_(0, min_(f7cm, plafond_PME - base_report_cappme_2013_PME))
-        base_report_cappme_2015_PME = max_(0, min_(f7cn, plafond_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME))
-        base_report_cappme_2016_PME = max_(0, min_(f7cc, plafond_PME - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME))
+        base_report_cappme_2013_PME = min_(f7cl, plafond)
+        base_report_cappme_2014_PME = max_(0, min_(f7cm, plafond - base_report_cappme_2013_PME))
+        base_report_cappme_2015_PME = max_(0, min_(f7cn, plafond - base_report_cappme_2013_PME - base_report_cappme_2014_PME))
+        base_report_cappme_2016_PME = max_(0, min_(f7cc, plafond - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME))
 
         # Réduction investissement TPE (souscription à partir de 2012) : imputation du plus ancien au plus récent
-        base_report_cappme_2013_TPE = min_(f7cq, plafond_TPE)
-        base_report_cappme_2014_TPE = max_(0, min_(f7cr, plafond_TPE - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2013_TPE))
-        base_report_cappme_2015_TPE = max_(0, min_(f7cv, plafond_TPE - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2013_TPE - base_report_cappme_2014_TPE))
-        base_report_cappme_2016_TPE = max_(0, min_(f7cx, plafond_TPE - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2013_TPE - base_report_cappme_2014_TPE - base_report_cappme_2015_TPE))
+        base_report_cappme_2013_TPE = min_(f7cq, plafond)
+        base_report_cappme_2014_TPE = max_(0, min_(f7cr, plafond - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2013_TPE))
+        base_report_cappme_2015_TPE = max_(0, min_(f7cv, plafond - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2013_TPE - base_report_cappme_2014_TPE))
+        base_report_cappme_2016_TPE = max_(0, min_(f7cx, plafond - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2013_TPE - base_report_cappme_2014_TPE - base_report_cappme_2015_TPE))
 
         # Réduction investissements de l'année courante
-        base_cappme_2017 = max_(0, min_(f7cf, plafond_TPE - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2013_TPE - base_report_cappme_2014_TPE - base_report_cappme_2015_TPE - base_report_cappme_2016_TPE))
+        base_cappme_2017 = max_(0, min_(f7cf, plafond - base_report_cappme_2013_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2013_TPE - base_report_cappme_2014_TPE - base_report_cappme_2015_TPE - base_report_cappme_2016_TPE))
 
         reports_plaf_general = f7cy + f7dy + f7ey + f7fy
 
@@ -1340,22 +1336,21 @@ class cappme(Variable):
 
         P = parameters(period).impot_revenu.calcul_reductions_impots.souscriptions.pme.souscription_capital
 
-        plafond_PME = P.seuil * (maries_ou_pacses + 1)
-        plafond_TPE = P.seuil_tpe * (maries_ou_pacses + 1)
+        plafond = P.seuil * (maries_ou_pacses + 1)
 
         # Réduction investissement PME (souscription avant 2012) : imputation du plus ancien au plus récent
-        base_report_cappme_2014_PME = min_(f7cl, plafond_PME)
-        base_report_cappme_2015_PME = max_(0, min_(f7cm, plafond_PME - base_report_cappme_2014_PME))
-        base_report_cappme_2016_PME = max_(0, min_(f7cn, plafond_PME - base_report_cappme_2014_PME - base_report_cappme_2015_PME))
+        base_report_cappme_2014_PME = min_(f7cl, plafond)
+        base_report_cappme_2015_PME = max_(0, min_(f7cm, plafond - base_report_cappme_2014_PME))
+        base_report_cappme_2016_PME = max_(0, min_(f7cn, plafond - base_report_cappme_2014_PME - base_report_cappme_2015_PME))
 
         # Réduction investissement TPE (souscription à partir de 2012) : imputation du plus ancien au plus récent
-        base_report_cappme_2014_TPE = min_(f7cq, plafond_TPE - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME)
-        base_report_cappme_2015_TPE = max_(0, min_(f7cr, plafond_TPE - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2014_TPE))
-        base_report_cappme_2016_TPE = max_(0, min_(f7cv, plafond_TPE - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2014_TPE - base_report_cappme_2015_TPE))
-        base_report_cappme_2017_TPE = max_(0, min_(f7cx, plafond_TPE - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2014_TPE - base_report_cappme_2015_TPE - base_report_cappme_2016_TPE))
+        base_report_cappme_2014_TPE = min_(f7cq, plafond - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME)
+        base_report_cappme_2015_TPE = max_(0, min_(f7cr, plafond - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2014_TPE))
+        base_report_cappme_2016_TPE = max_(0, min_(f7cv, plafond - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2014_TPE - base_report_cappme_2015_TPE))
+        base_report_cappme_2017_TPE = max_(0, min_(f7cx, plafond - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2014_TPE - base_report_cappme_2015_TPE - base_report_cappme_2016_TPE))
 
         # Réduction investissements de l'année courante
-        base_cappme_2018 = max_(0, min_(f7cf, plafond_TPE - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2014_TPE - base_report_cappme_2015_TPE - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE))
+        base_cappme_2018 = max_(0, min_(f7cf, plafond - base_report_cappme_2014_PME - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2014_TPE - base_report_cappme_2015_TPE - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE))
 
         reports_plaf_general = f7cy + f7dy + f7ey + f7fy + f7gy
 
@@ -1396,21 +1391,20 @@ class cappme(Variable):
 
         P = parameters(period).impot_revenu.calcul_reductions_impots.souscriptions.pme.souscription_capital
 
-        plafond_PME = P.seuil * (maries_ou_pacses + 1)
-        plafond_TPE = P.seuil_tpe * (maries_ou_pacses + 1)
+        plafond = P.seuil * (maries_ou_pacses + 1)
 
         # Réduction investissement PME (souscription avant 2012) : imputation du plus ancien au plus récent
-        base_report_cappme_2015_PME = min_(f7cl, plafond_PME)
-        base_report_cappme_2016_PME = max_(0, min_(f7cm, plafond_PME - base_report_cappme_2015_PME))
+        base_report_cappme_2015_PME = min_(f7cl, plafond)
+        base_report_cappme_2016_PME = max_(0, min_(f7cm, plafond - base_report_cappme_2015_PME))
 
         # Réduction investissement TPE (souscription à partir de 2012) : imputation du plus ancien au plus récent
-        base_report_cappme_2015_TPE = min_(f7cq, plafond_TPE - base_report_cappme_2015_PME - base_report_cappme_2016_PME)
-        base_report_cappme_2016_TPE = max_(0, min_(f7cr, plafond_TPE - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2015_TPE))
-        base_report_cappme_2017_TPE = max_(0, min_(f7cv, plafond_TPE - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2015_TPE - base_report_cappme_2016_TPE))
-        base_report_cappme_2018_TPE = max_(0, min_(f7cx, plafond_TPE - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2015_TPE - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE))
+        base_report_cappme_2015_TPE = min_(f7cq, plafond - base_report_cappme_2015_PME - base_report_cappme_2016_PME)
+        base_report_cappme_2016_TPE = max_(0, min_(f7cr, plafond - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2015_TPE))
+        base_report_cappme_2017_TPE = max_(0, min_(f7cv, plafond - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2015_TPE - base_report_cappme_2016_TPE))
+        base_report_cappme_2018_TPE = max_(0, min_(f7cx, plafond - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2015_TPE - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE))
 
         # Réduction investissements de l'année courante
-        base_cappme_2019 = max_(0, min_(f7cf, plafond_TPE - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2015_TPE - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE - base_report_cappme_2018_TPE))
+        base_cappme_2019 = max_(0, min_(f7cf, plafond - base_report_cappme_2015_PME - base_report_cappme_2016_PME - base_report_cappme_2015_TPE - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE - base_report_cappme_2018_TPE))
 
         reports_plaf_general = f7cy + f7dy + f7ey + f7fy + f7gy
 
@@ -1451,24 +1445,23 @@ class cappme(Variable):
 
         P = parameters(period).impot_revenu.calcul_reductions_impots.souscriptions.pme.souscription_capital
 
-        plafond_PME = P.seuil * (maries_ou_pacses + 1)
-        plafond_TPE = P.seuil_tpe * (maries_ou_pacses + 1)
+        plafond = P.seuil * (maries_ou_pacses + 1)
 
         # Réduction investissement PME (souscription avant 2012) : imputation du plus ancien au plus récent
-        base_report_cappme_2016_PME = min_(f7cl, plafond_PME)
+        base_report_cappme_2016_PME = min_(f7cl, plafond)
 
         # Réduction investissement TPE (souscription à partir de 2012) : imputation du plus ancien au plus récent,
         # en prenant en compte les versement avant 2012 qui seront pris en compte pour le seuil
-        base_report_cappme_2016_TPE = min_(f7cq, plafond_TPE - base_report_cappme_2016_PME)
-        base_report_cappme_2017_TPE = max_(0, min_(f7cr, plafond_TPE - base_report_cappme_2016_PME - base_report_cappme_2016_TPE))
-        base_report_cappme_2018_TPE = max_(0, min_(f7cv, plafond_TPE - base_report_cappme_2016_PME - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE))
-        base_report_cappme_2019_TPE = max_(0, min_(f7cx, plafond_TPE - base_report_cappme_2016_PME - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE - base_report_cappme_2018_TPE))
+        base_report_cappme_2016_TPE = min_(f7cq, plafond - base_report_cappme_2016_PME)
+        base_report_cappme_2017_TPE = max_(0, min_(f7cr, plafond - base_report_cappme_2016_PME - base_report_cappme_2016_TPE))
+        base_report_cappme_2018_TPE = max_(0, min_(f7cv, plafond - base_report_cappme_2016_PME - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE))
+        base_report_cappme_2019_TPE = max_(0, min_(f7cx, plafond - base_report_cappme_2016_PME - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE - base_report_cappme_2018_TPE))
 
         # Réduction investissements de l'année courante
         # on applique les investissements en commençant avec les plus anciennes
-        base_cappme_2020_avant0908 = max_(0, min_(f7cf, plafond_TPE - base_report_cappme_2016_PME - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE - base_report_cappme_2018_TPE - base_report_cappme_2019_TPE))
-        base_cappme_2020_apres0908 = max_(0, min_(f7ch, plafond_TPE - base_report_cappme_2016_PME - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE - base_report_cappme_2018_TPE - base_report_cappme_2019_TPE - base_cappme_2020_avant0908))
-        base_sfs_2020 = max_(0, min_(f7gw, plafond_TPE - plafond_TPE - base_report_cappme_2016_PME - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE - base_report_cappme_2018_TPE - base_report_cappme_2019_TPE - base_cappme_2020_avant0908 - base_cappme_2020_apres0908))
+        base_cappme_2020_avant0908 = max_(0, min_(f7cf, plafond - base_report_cappme_2016_PME - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE - base_report_cappme_2018_TPE - base_report_cappme_2019_TPE))
+        base_cappme_2020_apres0908 = max_(0, min_(f7ch, plafond - base_report_cappme_2016_PME - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE - base_report_cappme_2018_TPE - base_report_cappme_2019_TPE - base_cappme_2020_avant0908))
+        base_sfs_2020 = max_(0, min_(f7gw, plafond - plafond - base_report_cappme_2016_PME - base_report_cappme_2016_TPE - base_report_cappme_2017_TPE - base_report_cappme_2018_TPE - base_report_cappme_2019_TPE - base_cappme_2020_avant0908 - base_cappme_2020_apres0908))
 
         reports_plaf_general = f7cy + f7dy + f7ey + f7fy + f7gy
 
@@ -1509,27 +1502,27 @@ class cappme(Variable):
 
         P = parameters(period).impot_revenu.calcul_reductions_impots.souscriptions.pme.souscription_capital
 
-        plafond_TPE = P.seuil_tpe * (maries_ou_pacses + 1)
+        plafond_PME = P.seuil * (maries_ou_pacses + 1)
 
         # Réduction investissement TPE (souscription à partir de 2012) : imputation du plus ancien au plus récent,
         # dans l'ordre PME/ESUS > SFS
-        base_report_pme_2017_TPE = min_(f7cq, plafond_TPE)
-        base_report_pme_2018_TPE = max_(0, min_(f7cr, plafond_TPE - base_report_pme_2017_TPE))
-        base_report_pme_2019_TPE = max_(0, min_(f7cv, plafond_TPE - base_report_pme_2017_TPE - base_report_pme_2018_TPE))
-        base_pme_2020_avant0908 = max_(0, min_(f7cx, plafond_TPE - base_report_pme_2017_TPE - base_report_pme_2018_TPE - base_report_pme_2019_TPE))
-        base_pme_2020_apres0908 = max_(0, min_(f7cs, plafond_TPE - base_report_pme_2017_TPE - base_report_pme_2018_TPE - base_report_pme_2019_TPE - base_pme_2020_avant0908))
-        base_sfs_2020 = max_(0, min_(f7bs, plafond_TPE - base_report_pme_2017_TPE - base_report_pme_2018_TPE - base_report_pme_2019_TPE - base_pme_2020_avant0908 - base_pme_2020_apres0908))
+        base_report_pme_2017_TPE = min_(f7cq, plafond_PME)
+        base_report_pme_2018_TPE = max_(0, min_(f7cr, plafond_PME - base_report_pme_2017_TPE))
+        base_report_pme_2019_TPE = max_(0, min_(f7cv, plafond_PME - base_report_pme_2017_TPE - base_report_pme_2018_TPE))
+        base_pme_2020_avant0908 = max_(0, min_(f7cx, plafond_PME - base_report_pme_2017_TPE - base_report_pme_2018_TPE - base_report_pme_2019_TPE))
+        base_pme_2020_apres0908 = max_(0, min_(f7cs, plafond_PME - base_report_pme_2017_TPE - base_report_pme_2018_TPE - base_report_pme_2019_TPE - base_pme_2020_avant0908))
+        base_sfs_2020 = max_(0, min_(f7bs, plafond_PME - base_report_pme_2017_TPE - base_report_pme_2018_TPE - base_report_pme_2019_TPE - base_pme_2020_avant0908 - base_pme_2020_apres0908))
 
         # Réduction investissements de l'année courante
         # on applique les investissements en commençant avec les plus anciennes
-        base_pme_esus_2021_avant0805 = max_(0, min_(f7cf, plafond_TPE - base_report_pme_2017_TPE - base_report_pme_2018_TPE - base_report_pme_2019_TPE - base_pme_2020_avant0908 - base_pme_2020_apres0908 - base_sfs_2020))
-        base_pme_2021_apres0805 = max_(0, min_(f7ch, plafond_TPE - base_report_pme_2017_TPE - base_report_pme_2018_TPE - base_report_pme_2019_TPE - base_pme_2020_avant0908 - base_pme_2020_apres0908 - base_sfs_2020 - base_pme_esus_2021_avant0805))
+        base_pme_esus_2021_avant0805 = max_(0, min_(f7cf, plafond_PME - base_report_pme_2017_TPE - base_report_pme_2018_TPE - base_report_pme_2019_TPE - base_pme_2020_avant0908 - base_pme_2020_apres0908 - base_sfs_2020))
+        base_pme_2021_apres0805 = max_(0, min_(f7ch, plafond_PME - base_report_pme_2017_TPE - base_report_pme_2018_TPE - base_report_pme_2019_TPE - base_pme_2020_avant0908 - base_pme_2020_apres0908 - base_sfs_2020 - base_pme_esus_2021_avant0805))
 
         reports_plaf_general = f7cy + f7dy + f7ey + f7fy + f7gy
 
         return (
             reports_plaf_general
-            + P.taux18 * (base_report_pme_2017_TPE
+            + P.taux * (base_report_pme_2017_TPE
                 + base_report_pme_2018_TPE
                 + base_report_pme_2019_TPE
                 + base_pme_2020_avant0908
@@ -1567,7 +1560,7 @@ class cappme_esus_sfs(Variable):
 
         P = parameters(period).impot_revenu.calcul_reductions_impots.souscriptions.pme.souscription_capital
 
-        plafond_TPE = P.seuil_tpe * (maries_ou_pacses + 1)
+        plafond_TPE = P.seuil * (maries_ou_pacses + 1)
 
         # Réduction investissement TPE (souscription à partir de 2012) : imputation du plus ancien au plus récent,
         # dans l'ordre PME/ESUS > SFS
@@ -3569,8 +3562,9 @@ class rehab(Variable):
     value_type = float
     entity = FoyerFiscal
     label = "Réduction d'impôt pour travaux de réhabilitation des résidences de tourisme"
-    reference = 'https://www.legifrance.gouv.fr/affichCodeArticle.do?idArticle=LEGIARTI000033781921&cidTexte=LEGITEXT000006069577&categorieLien=id&dateTexte=20170101'
+    reference = 'https://www.legifrance.gouv.fr/codes/article_lc/LEGIARTI000033781921/'
     definition_period = YEAR
+    end = '2023-12-31'
 
     def formula_2017_01_01(foyer_fiscal, period, parameters):
         '''
@@ -3658,7 +3652,7 @@ class ri_saldom(Variable):
 
         nbpacmin = nb_pac_majoration_plafond + f7dl
         max_base = P.plafond * not_(annee1) + P.plafond_1ere_annee * annee1
-        max_du_max_non_inv = P.plafond_maximum * not_(annee1) + P.plafond_invalides_1ere_annee * annee1
+        max_du_max_non_inv = P.plafond_maximum * not_(annee1) + P.plafond_maximum_1ere_annee * annee1
         max_non_inv = min_(max_base + P.increment_plafond * nbpacmin, max_du_max_non_inv)
         max_non_inv2 = min_(max_base + P.increment_plafond * nb_pac_majoration_plafond, max_du_max_non_inv)
         max_effectif = max_non_inv * not_(invalide) + P.plafond_invalides * invalide
@@ -3693,7 +3687,7 @@ class ri_saldom(Variable):
             plaf = P.plafond_invalides
         else:
             if annee1.any():
-                plaf = min_(P.plafond_invalides_1ere_annee, P.plafond_1ere_annee + P.increment_plafond * (nb_pac_majoration_plafond + f7dl))
+                plaf = min_(P.plafond_maximum_1ere_annee, P.plafond_1ere_annee + P.increment_plafond * (nb_pac_majoration_plafond + f7dl))
             else:
                 plaf = min_(P.plafond_maximum, P.plafond + P.increment_plafond * (nb_pac_majoration_plafond + f7dl))
 
@@ -3721,9 +3715,9 @@ class scelli(Variable):
         '''
         f7hj = foyer_fiscal('f7hj', period)
         f7hk = foyer_fiscal('f7hk', period)
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
+        investissement_2009 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
 
-        return max_(P.taux25 * min_(P.max, f7hj), P.taux40 * min_(P.max, f7hk)) / 9
+        return max_(investissement_2009.logement_non_BBC.taux * min_(investissement_2009.plafond, f7hj), investissement_2009.scellier_outremer.taux * min_(investissement_2009.plafond, f7hk)) / 9
 
     def formula_2010_01_01(foyer_fiscal, period, parameters):
         '''
@@ -3739,18 +3733,18 @@ class scelli(Variable):
         f7hr = foyer_fiscal('f7hr_2017', period)
         f7hs = foyer_fiscal('f7hs_2017', period)
         f7la = foyer_fiscal('f7la', period)
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
+        investissement_2009_2010 = parameters('2010-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
 
         return (
             max_(
-                max_(P.taux25 * min_(P.max, f7hj), P.taux40 * min_(P.max, f7hk)),
-                max_(P.taux25 * min_(P.max, f7hn), P.taux40 * min_(P.max, f7ho))
+                max_(investissement_2009_2010.logement_non_BBC.taux * min_(investissement_2009_2010.plafond, f7hj), investissement_2009_2010.scellier_outremer.taux * min_(investissement_2009_2010.plafond, f7hk)),
+                max_(investissement_2009_2010.logement_non_BBC.taux * min_(investissement_2009_2010.plafond, f7hn), investissement_2009_2010.scellier_outremer.taux * min_(investissement_2009_2010.plafond, f7ho))
                 ) / 9
             + max_(
-                P.taux25 * min_(P.max, f7hl),
-                P.taux40 * min_(P.max, f7hm)
+                investissement_2009_2010.logement_non_BBC.taux * min_(investissement_2009_2010.plafond, f7hl),
+                investissement_2009_2010.scellier_outremer.taux * min_(investissement_2009_2010.plafond, f7hm)
                 ) / 9
-            + max_(P.taux25 * f7hr, P.taux40 * f7hs)
+            + max_(investissement_2009_2010.logement_non_BBC.taux * f7hr, investissement_2009_2010.scellier_outremer.taux * f7hs)
             + f7la)
 
     def formula_2011_01_01(foyer_fiscal, period, parameters):
@@ -3795,22 +3789,23 @@ class scelli(Variable):
         f7nr = foyer_fiscal('f7nr', period)
         f7ns = foyer_fiscal('f7ns', period)
         f7nt = foyer_fiscal('f7nt', period)
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
+        investissement_2009_2010 = parameters('2010-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2011 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
 
         return (
-            min_(P.max, maxi(
-                P.taux13 * max_(f7nf, f7nj) / 9,
-                P.taux15 * max_(f7ng, f7ni) / 9,
-                P.taux22 * max_(f7na, f7ne) / 9,
-                P.taux25 * maxi(f7nb, f7nc, f7nd, f7nh) / 9,
-                P.taux36 * maxi(f7nk / 9, f7no / 9, f7np / 5, f7nt / 5),
-                P.taux40 * maxi(f7nl / 9, f7nm / 9, f7nn / 9, f7nq / 5, f7nr / 5, f7ns / 5)
+            min_(investissement_2011.plafond, maxi(
+                investissement_2011.logement_non_BBC.taux * max_(f7nf, f7nj) / 9,
+                investissement_2011.logement_non_BBC.taux_transitoire * max_(f7ng, f7ni) / 9,
+                investissement_2011.logement_BBC.taux * max_(f7na, f7ne) / 9,
+                investissement_2009_2010.logement_BBC.taux * maxi(f7nb, f7nc, f7nd, f7nh) / 9,
+                investissement_2011.scellier_outremer.taux * maxi(f7nk / 9, f7no / 9, f7np / 5, f7nt / 5),
+                investissement_2009_2010.scellier_outremer.taux * maxi(f7nl / 9, f7nm / 9, f7nn / 9, f7nq / 5, f7nr / 5, f7ns / 5)
                 ))
-            + min_(P.max, maxi(P.taux25 * max_(f7hj, f7hn), P.taux40 * max_(f7hk, f7ho))) / 9
-            + min_(P.max, max_(P.taux25 * f7hl, P.taux40 * f7hm)) / 9
-            + min_(P.max, maxi(P.taux25 * f7hv, P.taux25 * f7hx, P.taux40 * f7hw, P.taux40 * f7hz))
-            + min_(P.max, max_(P.taux25 * f7ht, P.taux40 * f7hu))
-            + min_(P.max, max_(P.taux25 * f7hr, P.taux40 * f7hs))
+            + min_(investissement_2011.plafond, maxi(investissement_2009_2010.logement_BBC.taux * max_(f7hj, f7hn), investissement_2009_2010.scellier_outremer.taux * max_(f7hk, f7ho))) / 9
+            + min_(investissement_2011.plafond, max_(investissement_2009_2010.logement_BBC.taux * f7hl, investissement_2009_2010.scellier_outremer.taux * f7hm)) / 9
+            + min_(investissement_2011.plafond, maxi(investissement_2009_2010.logement_BBC.taux * f7hv, investissement_2009_2010.logement_BBC.taux * f7hx, investissement_2009_2010.scellier_outremer.taux * f7hw, investissement_2009_2010.scellier_outremer.taux * f7hz))
+            + min_(investissement_2011.plafond, max_(investissement_2009_2010.logement_BBC.taux * f7ht, investissement_2009_2010.scellier_outremer.taux * f7hu))
+            + min_(investissement_2011.plafond, max_(investissement_2009_2010.logement_BBC.taux * f7hr, investissement_2009_2010.scellier_outremer.taux * f7hs))
             + f7la + f7lb + f7lc
             )
 
@@ -3882,31 +3877,32 @@ class scelli(Variable):
         f7nr = foyer_fiscal('f7nr', period)
         f7ns = foyer_fiscal('f7ns', period)
         f7nt = foyer_fiscal('f7nt', period)
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P09 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
+        investissement_2009_2010 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2011 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2012 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
 
         return (
-            min_(P.max, maxi(
-                P.taux13 * max_(f7nf, f7nj) / 9,
-                P.taux15 * max_(f7ng, f7ni) / 9,
-                P.taux22 * max_(f7na, f7ne) / 9,
-                P.taux25 * maxi(f7nb, f7nc, f7nd, f7nh) / 9,
-                P.taux36 * maxi(f7nk / 9, f7no / 9, f7np / 5, f7nt / 5),
-                P.taux40 * maxi(f7nl / 9, f7nm / 9, f7nn / 9, f7nq / 5, f7nr / 5, f7ns / 5)
+            min_(investissement_2012.plafond, maxi(
+                investissement_2011.logement_non_BBC.taux * max_(f7nf, f7nj) / 9,
+                investissement_2011.logement_non_BBC.taux_transitoire * max_(f7ng, f7ni) / 9,
+                investissement_2011.logement_BBC.taux * max_(f7na, f7ne) / 9,
+                investissement_2009_2010.logement_BBC.taux * maxi(f7nb, f7nc, f7nd, f7nh) / 9,
+                investissement_2011.scellier_outremer.taux * maxi(f7nk / 9, f7no / 9, f7np / 5, f7nt / 5),
+                investissement_2009_2010.scellier_outremer.taux * maxi(f7nl / 9, f7nm / 9, f7nn / 9, f7nq / 5, f7nr / 5, f7ns / 5)
                 ))
-            + min_(P.max, maxi(P.taux25 * max_(f7hj, f7hn), P.taux40 * max_(f7hk, f7ho))) / 9
-            + min_(P.max, max_(P.taux25 * f7hl, P.taux40 * f7hm)) / 9
-            + min_(P.max, maxi(P.taux25 * f7hv, P.taux25 * f7hx, P.taux40 * f7hw, P.taux40 * f7hz))
-            + min_(P.max, max_(P.taux25 * f7ht, P.taux40 * f7hu))
-            + min_(P.max, max_(P.taux25 * f7hr, P.taux40 * f7hs))
+            + min_(investissement_2009_2010.plafond, maxi(investissement_2009_2010.logement_BBC.taux * max_(f7hj, f7hn), investissement_2009_2010.scellier_outremer.taux * max_(f7hk, f7ho))) / 9
+            + min_(investissement_2009_2010.plafond, max_(investissement_2009_2010.logement_BBC.taux * f7hl, investissement_2009_2010.scellier_outremer.taux * f7hm)) / 9
+            + min_(investissement_2009_2010.plafond, maxi(investissement_2009_2010.logement_BBC.taux * f7hv, investissement_2009_2010.logement_BBC.taux * f7hx, investissement_2009_2010.scellier_outremer.taux * f7hw, investissement_2009_2010.scellier_outremer.taux * f7hz))
+            + min_(investissement_2009_2010.plafond, max_(investissement_2009_2010.logement_BBC.taux * f7ht, investissement_2009_2010.scellier_outremer.taux * f7hu))
+            + min_(investissement_2009_2010.plafond, max_(investissement_2009_2010.logement_BBC.taux * f7hr, investissement_2009_2010.scellier_outremer.taux * f7hs))
             + f7la + f7lb + f7lc + f7ld + f7le + f7lf
             + f7ha + f7hb + f7hg + f7hh + f7hd + f7he + f7hf
-            + min_(P.max, maxi(
-                P09.taux_prorogation * max_(f7jf, f7jj) / 9,
-                P.taux13 * maxi(f7ja, f7je, f7jg, f7jh) / 9,
-                P.taux22 * maxi(f7jb, f7jd) / 9,
-                P.taux24 * maxi(f7jk / 9, f7jn / 9, f7jo / 5, f7jr / 5),
-                P.taux36 * maxi(f7jl / 9, f7jm / 9, f7jp / 5, f7jq / 5)
+            + min_(investissement_2009_2010.plafond, maxi(
+                investissement_2009_2010.taux_prorogation * max_(f7jf, f7jj) / 9,
+                investissement_2012.logement_BBC.taux * maxi(f7ja, f7je, f7jg, f7jh) / 9,
+                investissement_2011.logement_BBC.taux * maxi(f7jb, f7jd) / 9,
+                investissement_2012.scellier_outremer.taux * maxi(f7jk / 9, f7jn / 9, f7jo / 5, f7jr / 5),
+                investissement_2011.scellier_outremer.taux * maxi(f7jl / 9, f7jm / 9, f7jp / 5, f7jq / 5)
                 ))
             )
 
@@ -3996,28 +3992,29 @@ class scelli(Variable):
         f7nr = foyer_fiscal('f7nr', period)
         f7ns = foyer_fiscal('f7ns', period)
         f7nt = foyer_fiscal('f7nt', period)
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P09 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-
-        reductions = (min_(P.max, maxi(
-            P.taux13 * max_(f7nf, f7nj) / 9,
-            P.taux15 * max_(f7ng, f7ni) / 9,
-            P.taux22 * max_(f7na, f7ne) / 9,
-            P.taux25 * maxi(f7nb, f7nc, f7nd, f7nh) / 9,
-            P.taux36 * maxi(f7nk / 9, f7no / 9, f7np / 5, f7nt / 5),
-            P.taux40 * maxi(f7nl / 9, f7nm / 9, f7nn / 9, f7nq / 5, f7nr / 5, f7ns / 5)
+        investissement_2009_2010 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2011 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2012 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+
+        reductions = (min_(investissement_2012.plafond, maxi(
+            investissement_2011.logement_non_BBC.taux * max_(f7nf, f7nj) / 9,
+            investissement_2011.logement_non_BBC.taux_transitoire * max_(f7ng, f7ni) / 9,
+            investissement_2011.logement_BBC.taux * max_(f7na, f7ne) / 9,
+            investissement_2009_2010.logement_BBC.taux * maxi(f7nb, f7nc, f7nd, f7nh) / 9,
+            investissement_2011.scellier_outremer.taux * maxi(f7nk / 9, f7no / 9, f7np / 5, f7nt / 5),
+            investissement_2009_2010.scellier_outremer.taux * maxi(f7nl / 9, f7nm / 9, f7nn / 9, f7nq / 5, f7nr / 5, f7ns / 5)
             ))
-            + min_(P.max, maxi(P.taux25 * max_(f7hj, f7hn), P.taux40 * max_(f7hk, f7ho))) / 9
-            + min_(P.max, max_(P.taux25 * f7hl, P.taux40 * f7hm)) / 9
-            + min_(P.max, maxi(P.taux25 * f7hv, P.taux25 * f7hx, P.taux40 * f7hw, P.taux40 * f7hz))
-            + min_(P.max, max_(P.taux25 * f7ht, P.taux40 * f7hu))
-            + min_(P.max, max_(P.taux25 * f7hr, P.taux40 * f7hs))
-            + min_(P.max, maxi(
-                P09.taux_prorogation * maxi(f7jf, f7jj, f7fb) / 9,
-                P.taux13 * maxi(f7ja, f7je, f7jg, f7jh, f7fa) / 9,
-                P.taux22 * maxi(f7jb, f7jd) / 9,
-                P.taux24 * maxi(f7jk / 9, f7jn / 9, f7jo / 5, f7jr / 5, f7fc / 9, f7fd / 5),
-                P.taux36 * maxi(f7jl / 9, f7jm / 9, f7jp / 5, f7jq / 5)
+            + min_(investissement_2012.plafond, maxi(investissement_2009_2010.logement_BBC.taux * max_(f7hj, f7hn), investissement_2009_2010.scellier_outremer.taux * max_(f7hk, f7ho))) / 9
+            + min_(investissement_2012.plafond, max_(investissement_2009_2010.logement_BBC.taux * f7hl, investissement_2009_2010.scellier_outremer.taux * f7hm)) / 9
+            + min_(investissement_2012.plafond, maxi(investissement_2009_2010.logement_BBC.taux * f7hv, investissement_2009_2010.logement_BBC.taux * f7hx, investissement_2009_2010.scellier_outremer.taux * f7hw, investissement_2009_2010.scellier_outremer.taux * f7hz))
+            + min_(investissement_2012.plafond, max_(investissement_2009_2010.logement_BBC.taux * f7ht, investissement_2009_2010.scellier_outremer.taux * f7hu))
+            + min_(investissement_2012.plafond, max_(investissement_2009_2010.logement_BBC.taux * f7hr, investissement_2009_2010.scellier_outremer.taux * f7hs))
+            + min_(investissement_2012.plafond, maxi(
+                investissement_2009_2010.taux_prorogation * maxi(f7jf, f7jj, f7fb) / 9,
+                investissement_2012.logement_BBC.taux * maxi(f7ja, f7je, f7jg, f7jh, f7fa) / 9,
+                investissement_2011.logement_BBC.taux * maxi(f7jb, f7jd) / 9,
+                investissement_2012.scellier_outremer.taux * maxi(f7jk / 9, f7jn / 9, f7jo / 5, f7jr / 5, f7fc / 9, f7fd / 5),
+                investissement_2011.scellier_outremer.taux * maxi(f7jl / 9, f7jm / 9, f7jp / 5, f7jq / 5)
                 ))
             + f7la + f7lb + f7lc + f7ld + f7le + f7lf + f7lm + f7ls + f7lz
             + f7mg
@@ -4130,42 +4127,43 @@ class scelli(Variable):
         f7yk = foyer_fiscal('f7yk', period)
         f7yl = foyer_fiscal('f7yl', period)
 
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P09 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
+        investissement_2009_2010 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2011 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2012 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
 
         report_reduc_scelli_non_impute = f7la + f7lb + f7lc + f7ld + f7le + f7lf + f7lm + f7ls + f7lz + f7mg + f7mh + f7lx + f7lt + f7ln
 
-        report_scelli_2009 = min_(P.max, max_(P.taux25 * f7hr, P.taux40 * f7hs))
-        report_scelli_2010 = min_(P.max, P.taux25 * f7hv + P.taux25 * f7hx + P.taux40 * f7hw + P.taux40 * f7hz) + min_(P.max, P.taux25 * f7ht + P.taux40 * f7hu)
+        report_scelli_2009 = min_(investissement_2009_2010.plafond, max_(investissement_2009_2010.logement_BBC.taux * f7hr, investissement_2009_2010.scellier_outremer.taux * f7hs))
+        report_scelli_2010 = min_(investissement_2009_2010.plafond, investissement_2009_2010.logement_BBC.taux * f7hv + investissement_2009_2010.logement_BBC.taux * f7hx + investissement_2009_2010.scellier_outremer.taux * f7hw + investissement_2009_2010.scellier_outremer.taux * f7hz) + min_(investissement_2009_2010.plafond, investissement_2009_2010.logement_BBC.taux * f7ht + investissement_2009_2010.scellier_outremer.taux * f7hu)
         report_scelli_2011 = f7ha + f7hb + f7hg + f7hh + f7hd + f7he + f7hf
         report_scelli_2012 = f7gj + f7gk + f7gl + f7gp + f7gs + f7gt + f7gu + f7gv + f7gx + f7gw
         report_scelli_2013 = f7ya + f7yb + f7yc + f7yd + f7ye + f7yf + f7yg + f7yh + f7yi + f7yj + f7yk + f7yl
 
-        reduc_scelli_2014_invest_2009 = min_(P.max, max_(P.taux25 * f7hl, P.taux40 * f7hm)) / 9
+        reduc_scelli_2014_invest_2009 = min_(investissement_2009_2010.plafond, max_(investissement_2009_2010.logement_BBC.taux * f7hl, investissement_2009_2010.scellier_outremer.taux * f7hm)) / 9
 
-        reduc_scelli_2014_invest_2010 = min_(P.max, maxi(
-            P.taux25 * max_(f7hj, f7hn) / 9,
-            P.taux40 * max_(f7hk, f7ho) / 9))
+        reduc_scelli_2014_invest_2010 = min_(investissement_2009_2010.plafond, maxi(
+            investissement_2009_2010.logement_BBC.taux * max_(f7hj, f7hn) / 9,
+            investissement_2009_2010.scellier_outremer.taux * max_(f7hk, f7ho) / 9))
 
-        reduc_scelli_2014_invest_2011 = min_(P.max, maxi(
-            P.taux13 * max_(f7nf, f7nj) / 9,
-            P.taux15 * max_(f7ng, f7ni) / 9,
-            P.taux22 * max_(f7na, f7ne) / 9,
-            P.taux25 * maxi(f7nb, f7nc, f7nd, f7nh) / 9,
-            P.taux36 * maxi(f7nk / 9, f7no / 9, f7np / 5, f7nt / 5),
-            P.taux40 * maxi(f7nl / 9, f7nm / 9, f7nn / 9, f7nq / 5, f7nr / 5, f7ns / 5)))
+        reduc_scelli_2014_invest_2011 = min_(investissement_2011.plafond, maxi(
+            investissement_2011.logement_non_BBC.taux * max_(f7nf, f7nj) / 9,
+            investissement_2011.logement_non_BBC.taux_transitoire * max_(f7ng, f7ni) / 9,
+            investissement_2011.logement_BBC.taux * max_(f7na, f7ne) / 9,
+            investissement_2009_2010.logement_BBC.taux * maxi(f7nb, f7nc, f7nd, f7nh) / 9,
+            investissement_2011.scellier_outremer.taux * maxi(f7nk / 9, f7no / 9, f7np / 5, f7nt / 5),
+            investissement_2009_2010.scellier_outremer.taux * maxi(f7nl / 9, f7nm / 9, f7nn / 9, f7nq / 5, f7nr / 5, f7ns / 5)))
 
-        reduc_scelli_2014_invest_2012 = min_(P.max, maxi(
-            P09.taux_prorogation * maxi(f7jf, f7jj) / 9,
-            P.taux13 * maxi(f7ja, f7je, f7jg, f7jh) / 9,
-            P.taux22 * maxi(f7jb, f7jd) / 9,
-            P.taux24 * maxi(f7jk / 9, f7jn / 9, f7jo / 5, f7jr / 5),
-            P.taux36 * maxi(f7jl / 9, f7jm / 9, f7jp / 5, f7jq / 5)))
+        reduc_scelli_2014_invest_2012 = min_(investissement_2012.plafond, maxi(
+            investissement_2009_2010.taux_prorogation * maxi(f7jf, f7jj) / 9,
+            investissement_2012.logement_BBC.taux * maxi(f7ja, f7je, f7jg, f7jh) / 9,
+            investissement_2011.logement_BBC.taux * maxi(f7jb, f7jd) / 9,
+            investissement_2012.scellier_outremer.taux * maxi(f7jk / 9, f7jn / 9, f7jo / 5, f7jr / 5),
+            investissement_2011.scellier_outremer.taux * maxi(f7jl / 9, f7jm / 9, f7jp / 5, f7jq / 5)))
 
-        reduc_scelli_2014_invest_mars_2013 = min_(P.max, maxi(
-            P09.taux_prorogation * f7fb / 9,
-            P.taux13 * f7fa / 9,
-            P.taux24 * maxi(f7fc / 9, f7fd / 5)))
+        reduc_scelli_2014_invest_mars_2013 = min_(investissement_2012.plafond, maxi(
+            investissement_2009_2010.taux_prorogation * f7fb / 9,
+            investissement_2012.logement_BBC.taux * f7fa / 9,
+            investissement_2012.scellier_outremer.taux * maxi(f7fc / 9, f7fd / 5)))
 
         reductions = (
             reduc_scelli_2014_invest_2009
@@ -4287,43 +4285,44 @@ class scelli(Variable):
         f7yr = foyer_fiscal('f7yr', period)
         f7ys = foyer_fiscal('f7ys', period)
 
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P09 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
+        investissement_2009_2010 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2011 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2012 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
 
         report_reduc_scelli_non_impute = f7la + f7lb + f7lc + f7ld + f7le + f7lf + f7lm + f7ls + f7lz + f7mg + f7mh + f7lx + f7lt + f7ln + f7lg + f7lh + f7li + f7lj
 
-        report_scelli_2009 = min_(P.max, max_(P.taux25 * f7hr, P.taux40 * f7hs))
-        report_scelli_2010 = min_(P.max, P.taux25 * f7hv + P.taux25 * f7hx + P.taux40 * f7hw + P.taux40 * f7hz) + min_(P.max, P.taux25 * f7ht + P.taux40 * f7hu)
+        report_scelli_2009 = min_(investissement_2009_2010.plafond, max_(investissement_2009_2010.logement_BBC.taux * f7hr, investissement_2009_2010.scellier_outremer.taux * f7hs))
+        report_scelli_2010 = min_(investissement_2009_2010.plafond, investissement_2009_2010.logement_BBC.taux * f7hv + investissement_2009_2010.logement_BBC.taux * f7hx + investissement_2009_2010.scellier_outremer.taux * f7hw + investissement_2009_2010.scellier_outremer.taux * f7hz) + min_(investissement_2009_2010.plafond, investissement_2009_2010.logement_BBC.taux * f7ht + investissement_2009_2010.scellier_outremer.taux * f7hu)
         report_scelli_2011 = f7ha + f7hg + f7hh + f7hd + f7hf
         report_scelli_2012 = f7gj + f7gl + f7gs + f7gu + f7gv + f7gx + f7gw
         report_scelli_2013 = f7yb + f7yd + f7yf + f7yh + f7yj + f7yk + f7yl
         report_scelli_2014 = f7ym + f7yn + f7yo + f7yp + f7yq + f7yr + f7ys
 
-        reduc_scelli_2015_invest_2009 = min_(P.max, max_(P.taux25 * f7hl, P.taux40 * f7hm)) / 9
+        reduc_scelli_2015_invest_2009 = min_(investissement_2009_2010.plafond, max_(investissement_2009_2010.logement_BBC.taux * f7hl, investissement_2009_2010.scellier_outremer.taux * f7hm)) / 9
 
-        reduc_scelli_2015_invest_2010 = min_(P.max, maxi(
-            P.taux25 * max_(f7hj, f7hn) / 9,
-            P.taux40 * max_(f7hk, f7ho) / 9))
+        reduc_scelli_2015_invest_2010 = min_(investissement_2009_2010.plafond, maxi(
+            investissement_2009_2010.logement_BBC.taux * max_(f7hj, f7hn) / 9,
+            investissement_2009_2010.scellier_outremer.taux * max_(f7hk, f7ho) / 9))
 
-        reduc_scelli_2015_invest_2011 = min_(P.max, maxi(
-            P.taux13 * max_(f7nf, f7nj) / 9,
-            P.taux15 * max_(f7ng, f7ni) / 9,
-            P.taux22 * max_(f7na, f7ne) / 9,
-            P.taux25 * maxi(f7nb, f7nc, f7nd, f7nh) / 9,
-            P.taux36 * maxi(f7nk / 9, f7no / 9, f7np / 5, f7nt / 5),
-            P.taux40 * maxi(f7nl / 9, f7nm / 9, f7nn / 9, f7nq / 5, f7nr / 5, f7ns / 5)))
+        reduc_scelli_2015_invest_2011 = min_(investissement_2011.plafond, maxi(
+            investissement_2011.logement_non_BBC.taux * max_(f7nf, f7nj) / 9,
+            investissement_2011.logement_non_BBC.taux_transitoire * max_(f7ng, f7ni) / 9,
+            investissement_2011.logement_BBC.taux * max_(f7na, f7ne) / 9,
+            investissement_2011.logement_BBC.taux * maxi(f7nb, f7nc, f7nd, f7nh) / 9,
+            investissement_2011.scellier_outremer.taux * maxi(f7nk / 9, f7no / 9, f7np / 5, f7nt / 5),
+            investissement_2009_2010.scellier_outremer.taux * maxi(f7nl / 9, f7nm / 9, f7nn / 9, f7nq / 5, f7nr / 5, f7ns / 5)))
 
-        reduc_scelli_2015_invest_2012 = min_(P.max, maxi(
-            P09.taux_prorogation * maxi(f7jf, f7jj) / 9,
-            P.taux13 * maxi(f7ja, f7je, f7jg, f7jh) / 9,
-            P.taux22 * maxi(f7jb, f7jd) / 9,
-            P.taux24 * maxi(f7jk / 9, f7jn / 9, f7jo / 5, f7jr / 5),
-            P.taux36 * maxi(f7jl / 9, f7jm / 9, f7jp / 5, f7jq / 5)))
+        reduc_scelli_2015_invest_2012 = min_(investissement_2012.plafond, maxi(
+            investissement_2009_2010.taux_prorogation * maxi(f7jf, f7jj) / 9,
+            investissement_2012.logement_BBC.taux * maxi(f7ja, f7je, f7jg, f7jh) / 9,
+            investissement_2011.logement_BBC.taux * maxi(f7jb, f7jd) / 9,
+            investissement_2012.scellier_outremer.taux * maxi(f7jk / 9, f7jn / 9, f7jo / 5, f7jr / 5),
+            investissement_2011.scellier_outremer.taux * maxi(f7jl / 9, f7jm / 9, f7jp / 5, f7jq / 5)))
 
-        reduc_scelli_2015_invest_mars_2013 = min_(P.max, maxi(
-            P09.taux_prorogation * f7fb / 9,
-            P.taux13 * f7fa / 9,
-            P.taux24 * maxi(f7fc / 9, f7fd / 5)))
+        reduc_scelli_2015_invest_mars_2013 = min_(investissement_2012.plafond, maxi(
+            investissement_2009_2010.taux_prorogation * f7fb / 9,
+            investissement_2012.logement_BBC.taux * f7fa / 9,
+            investissement_2012.scellier_outremer.taux * maxi(f7fc / 9, f7fd / 5)))
 
         reductions = (
             reduc_scelli_2015_invest_2009
@@ -4395,42 +4394,42 @@ class scelli(Variable):
         inv_3_6 = ['f7zb', 'f7zc']
         inv_3_5 = ['f7za', 'f7zd']
 
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P09 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P11 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
+        investissement_2009_2010 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2011 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2012 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
 
         ri_rep = sum([foyer_fiscal(rep, period) for rep in reports])
 
-        ri_rep = ri_rep + min_(P.max, sum([foyer_fiscal(r, period) for r in reports_base_40]) * P.taux40)
-        ri_rep = ri_rep + min_(P.max, sum([foyer_fiscal(r, period) for r in reports_base_25]) * P.taux25)
-
-        base_inv_5_40 = min_(sum([foyer_fiscal(i, period) for i in inv_5_40]), P.max)
-        base_inv_5_36 = min_(sum([foyer_fiscal(i, period) for i in inv_5_36]), P.max - base_inv_5_40)
-        base_inv_5_24 = min_(sum([foyer_fiscal(i, period) for i in inv_5_24]), P.max - base_inv_5_40 - base_inv_5_36)
-        base_inv_9_40 = min_(sum([foyer_fiscal(i, period) for i in inv_9_40]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24)
-        base_inv_9_36 = min_(sum([foyer_fiscal(i, period) for i in inv_9_36]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40)
-        base_inv_9_25 = min_(sum([foyer_fiscal(i, period) for i in inv_9_25]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36)
-        base_inv_9_24 = min_(sum([foyer_fiscal(i, period) for i in inv_9_24]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25)
-        base_inv_9_22 = min_(sum([foyer_fiscal(i, period) for i in inv_9_22]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24)
-        base_inv_9_15 = min_(sum([foyer_fiscal(i, period) for i in inv_9_15]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22)
-        base_inv_9_13 = min_(sum([foyer_fiscal(i, period) for i in inv_9_13]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15)
-        base_inv_9_6 = min_(sum([foyer_fiscal(i, period) for i in inv_9_6]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13)
-        base_inv_3_6 = min_(sum([foyer_fiscal(i, period) for i in inv_3_6]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13 - base_inv_9_6)
-        base_inv_3_5 = min_(sum([foyer_fiscal(i, period) for i in inv_3_5]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13 - base_inv_9_6 - base_inv_3_6)
-
-        red_inv_5_40 = base_inv_5_40 * P.taux40 / 5
-        red_inv_5_36 = base_inv_5_36 * P.taux36 / 5
-        red_inv_5_24 = base_inv_5_24 * P.taux24 / 5
-        red_inv_9_40 = base_inv_9_40 * P.taux40 / 9
-        red_inv_9_36 = base_inv_9_36 * P.taux36 / 9
-        red_inv_9_25 = base_inv_9_25 * P.taux25 / 9
-        red_inv_9_24 = base_inv_9_24 * P.taux24 / 9
-        red_inv_9_22 = base_inv_9_22 * P.taux22 / 9
-        red_inv_9_15 = base_inv_9_15 * P.taux15 / 9
-        red_inv_9_13 = base_inv_9_13 * P.taux13 / 9
-        red_inv_9_6 = base_inv_9_6 * P09.taux_prorogation / 9
-        red_inv_3_6 = base_inv_3_6 * P09.taux_prorogation / 3
-        red_inv_3_5 = base_inv_3_5 * P11.taux_prorogation / 3
+        ri_rep = ri_rep + min_(investissement_2009_2010.plafond, sum([foyer_fiscal(r, period) for r in reports_base_40]) * investissement_2009_2010.scellier_outremer.taux)
+        ri_rep = ri_rep + min_(investissement_2009_2010.plafond, sum([foyer_fiscal(r, period) for r in reports_base_25]) * investissement_2009_2010.logement_BBC.taux)
+
+        base_inv_5_40 = min_(sum([foyer_fiscal(i, period) for i in inv_5_40]), investissement_2012.plafond)
+        base_inv_5_36 = min_(sum([foyer_fiscal(i, period) for i in inv_5_36]), investissement_2012.plafond - base_inv_5_40)
+        base_inv_5_24 = min_(sum([foyer_fiscal(i, period) for i in inv_5_24]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36)
+        base_inv_9_40 = min_(sum([foyer_fiscal(i, period) for i in inv_9_40]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24)
+        base_inv_9_36 = min_(sum([foyer_fiscal(i, period) for i in inv_9_36]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40)
+        base_inv_9_25 = min_(sum([foyer_fiscal(i, period) for i in inv_9_25]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36)
+        base_inv_9_24 = min_(sum([foyer_fiscal(i, period) for i in inv_9_24]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25)
+        base_inv_9_22 = min_(sum([foyer_fiscal(i, period) for i in inv_9_22]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24)
+        base_inv_9_15 = min_(sum([foyer_fiscal(i, period) for i in inv_9_15]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22)
+        base_inv_9_13 = min_(sum([foyer_fiscal(i, period) for i in inv_9_13]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15)
+        base_inv_9_6 = min_(sum([foyer_fiscal(i, period) for i in inv_9_6]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13)
+        base_inv_3_6 = min_(sum([foyer_fiscal(i, period) for i in inv_3_6]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13 - base_inv_9_6)
+        base_inv_3_5 = min_(sum([foyer_fiscal(i, period) for i in inv_3_5]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13 - base_inv_9_6 - base_inv_3_6)
+
+        red_inv_5_40 = base_inv_5_40 * investissement_2009_2010.scellier_outremer.taux / 5
+        red_inv_5_36 = base_inv_5_36 * investissement_2011.scellier_outremer.taux / 5
+        red_inv_5_24 = base_inv_5_24 * investissement_2012.scellier_outremer.taux / 5
+        red_inv_9_40 = base_inv_9_40 * investissement_2009_2010.scellier_outremer.taux / 9
+        red_inv_9_36 = base_inv_9_36 * investissement_2011.scellier_outremer.taux / 9
+        red_inv_9_25 = base_inv_9_25 * investissement_2009_2010.logement_BBC.taux / 9
+        red_inv_9_24 = base_inv_9_24 * investissement_2012.scellier_outremer.taux / 9
+        red_inv_9_22 = base_inv_9_22 * investissement_2011.logement_BBC.taux / 9
+        red_inv_9_15 = base_inv_9_15 * investissement_2011.logement_non_BBC.taux_transitoire / 9
+        red_inv_9_13 = base_inv_9_13 * investissement_2011.logement_non_BBC.taux / 9
+        red_inv_9_6 = base_inv_9_6 * investissement_2009_2010.taux_prorogation / 9
+        red_inv_3_6 = base_inv_3_6 * investissement_2009_2010.taux_prorogation / 3
+        red_inv_3_5 = base_inv_3_5 * investissement_2011.taux_prorogation / 3
 
         reductions = ri_rep + red_inv_5_40 + red_inv_5_36 + red_inv_5_24 + red_inv_9_40 + red_inv_9_36 + red_inv_9_25 + red_inv_9_24 + red_inv_9_22 + red_inv_9_15 + red_inv_9_13 + red_inv_9_6 + red_inv_3_6 + red_inv_3_5
 
@@ -4483,45 +4482,44 @@ class scelli(Variable):
         inv_3_5 = ['f7za', 'f7zd', 'f7ze', 'f7zh', 'f7zj', 'f7zk']
         inv_3_4 = ['f7zi', 'f7zl']
 
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P09 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P11 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P12 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
+        investissement_2009_2010 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2011 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2012 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
 
         ri_rep = sum([foyer_fiscal(rep, period) for rep in reports])
 
-        ri_rep = ri_rep + min_(P.max, sum([foyer_fiscal(r, period) for r in reports_base_40]) * P.taux40)
-        ri_rep = ri_rep + min_(P.max, sum([foyer_fiscal(r, period) for r in reports_base_25]) * P.taux25)
-
-        base_inv_5_40 = min_(sum([foyer_fiscal(i, period) for i in inv_5_40]), P.max)
-        base_inv_5_36 = min_(sum([foyer_fiscal(i, period) for i in inv_5_36]), P.max - base_inv_5_40)
-        base_inv_5_24 = min_(sum([foyer_fiscal(i, period) for i in inv_5_24]), P.max - base_inv_5_40 - base_inv_5_36)
-        base_inv_9_40 = min_(sum([foyer_fiscal(i, period) for i in inv_9_40]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24)
-        base_inv_9_36 = min_(sum([foyer_fiscal(i, period) for i in inv_9_36]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40)
-        base_inv_9_25 = min_(sum([foyer_fiscal(i, period) for i in inv_9_25]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36)
-        base_inv_9_24 = min_(sum([foyer_fiscal(i, period) for i in inv_9_24]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25)
-        base_inv_9_22 = min_(sum([foyer_fiscal(i, period) for i in inv_9_22]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24)
-        base_inv_9_15 = min_(sum([foyer_fiscal(i, period) for i in inv_9_15]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22)
-        base_inv_9_13 = min_(sum([foyer_fiscal(i, period) for i in inv_9_13]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15)
-        base_inv_9_6 = min_(sum([foyer_fiscal(i, period) for i in inv_9_6]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13)
-        base_inv_3_6 = min_(sum([foyer_fiscal(i, period) for i in inv_3_6]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13 - base_inv_9_6)
-        base_inv_3_5 = min_(sum([foyer_fiscal(i, period) for i in inv_3_5]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13 - base_inv_9_6 - base_inv_3_6)
-        base_inv_3_4 = min_(sum([foyer_fiscal(i, period) for i in inv_3_4]), P.max - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13 - base_inv_9_6 - base_inv_3_6 - base_inv_3_5)
-
-        red_inv_5_40 = base_inv_5_40 * P.taux40 / 5
-        red_inv_5_36 = base_inv_5_36 * P.taux36 / 5
-        red_inv_5_24 = base_inv_5_24 * P.taux24 / 5
-        red_inv_9_40 = base_inv_9_40 * P.taux40 / 9
-        red_inv_9_36 = base_inv_9_36 * P.taux36 / 9
-        red_inv_9_25 = base_inv_9_25 * P.taux25 / 9
-        red_inv_9_24 = base_inv_9_24 * P.taux24 / 9
-        red_inv_9_22 = base_inv_9_22 * P.taux22 / 9
-        red_inv_9_15 = base_inv_9_15 * P.taux15 / 9
-        red_inv_9_13 = base_inv_9_13 * P.taux13 / 9
-        red_inv_9_6 = base_inv_9_6 * P09.taux_prorogation / 9
-        red_inv_3_6 = base_inv_3_6 * P09.taux_prorogation / 3
-        red_inv_3_5 = base_inv_3_5 * P11.taux_prorogation / 3
-        red_inv_3_4 = base_inv_3_4 * P12.taux_prorogation / 3
+        ri_rep = ri_rep + min_(investissement_2009_2010.plafond, sum([foyer_fiscal(r, period) for r in reports_base_40]) * investissement_2009_2010.scellier_outremer.taux)
+        ri_rep = ri_rep + min_(investissement_2009_2010.plafond, sum([foyer_fiscal(r, period) for r in reports_base_25]) * investissement_2009_2010.logement_BBC.taux)
+
+        base_inv_5_40 = min_(sum([foyer_fiscal(i, period) for i in inv_5_40]), investissement_2012.plafond)
+        base_inv_5_36 = min_(sum([foyer_fiscal(i, period) for i in inv_5_36]), investissement_2012.plafond - base_inv_5_40)
+        base_inv_5_24 = min_(sum([foyer_fiscal(i, period) for i in inv_5_24]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36)
+        base_inv_9_40 = min_(sum([foyer_fiscal(i, period) for i in inv_9_40]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24)
+        base_inv_9_36 = min_(sum([foyer_fiscal(i, period) for i in inv_9_36]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40)
+        base_inv_9_25 = min_(sum([foyer_fiscal(i, period) for i in inv_9_25]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36)
+        base_inv_9_24 = min_(sum([foyer_fiscal(i, period) for i in inv_9_24]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25)
+        base_inv_9_22 = min_(sum([foyer_fiscal(i, period) for i in inv_9_22]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24)
+        base_inv_9_15 = min_(sum([foyer_fiscal(i, period) for i in inv_9_15]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22)
+        base_inv_9_13 = min_(sum([foyer_fiscal(i, period) for i in inv_9_13]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15)
+        base_inv_9_6 = min_(sum([foyer_fiscal(i, period) for i in inv_9_6]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13)
+        base_inv_3_6 = min_(sum([foyer_fiscal(i, period) for i in inv_3_6]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13 - base_inv_9_6)
+        base_inv_3_5 = min_(sum([foyer_fiscal(i, period) for i in inv_3_5]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13 - base_inv_9_6 - base_inv_3_6)
+        base_inv_3_4 = min_(sum([foyer_fiscal(i, period) for i in inv_3_4]), investissement_2012.plafond - base_inv_5_40 - base_inv_5_36 - base_inv_5_24 - base_inv_9_40 - base_inv_9_36 - base_inv_9_25 - base_inv_9_24 - base_inv_9_22 - base_inv_9_15 - base_inv_9_13 - base_inv_9_6 - base_inv_3_6 - base_inv_3_5)
+
+        red_inv_5_40 = base_inv_5_40 * investissement_2009_2010.scellier_outremer.taux / 5
+        red_inv_5_36 = base_inv_5_36 * investissement_2011.scellier_outremer.taux / 5
+        red_inv_5_24 = base_inv_5_24 * investissement_2012.scellier_outremer.taux / 5
+        red_inv_9_40 = base_inv_9_40 * investissement_2009_2010.scellier_outremer.taux / 9
+        red_inv_9_36 = base_inv_9_36 * investissement_2011.scellier_outremer.taux / 9
+        red_inv_9_25 = base_inv_9_25 * investissement_2009_2010.logement_BBC.taux / 9
+        red_inv_9_24 = base_inv_9_24 * investissement_2012.scellier_outremer.taux / 9
+        red_inv_9_22 = base_inv_9_22 * investissement_2011.logement_BBC.taux / 9
+        red_inv_9_15 = base_inv_9_15 * investissement_2011.logement_non_BBC.taux_transitoire / 9
+        red_inv_9_13 = base_inv_9_13 * investissement_2012.logement_BBC.taux / 9
+        red_inv_9_6 = base_inv_9_6 * investissement_2009_2010.taux_prorogation / 9
+        red_inv_3_6 = base_inv_3_6 * investissement_2009_2010.taux_prorogation / 3
+        red_inv_3_5 = base_inv_3_5 * investissement_2011.taux_prorogation / 3
+        red_inv_3_4 = base_inv_3_4 * investissement_2012.taux_prorogation / 3
 
         reductions = ri_rep + red_inv_5_40 + red_inv_5_36 + red_inv_5_24 + red_inv_9_40 + red_inv_9_36 + red_inv_9_25 + red_inv_9_24 + red_inv_9_22 + red_inv_9_15 + red_inv_9_13 + red_inv_9_6 + red_inv_3_6 + red_inv_3_5 + red_inv_3_4
 
@@ -4591,23 +4589,22 @@ class scelli(Variable):
             'f7sl', 'f7sm_2019',
             ]
 
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P09 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P11 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P12 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
+        investissement_2009_2010 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2011 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2012 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
 
         ri_rep = sum([foyer_fiscal(rep, period) for rep in reports])
 
-        ri_rep = ri_rep + min_(P.max, sum([foyer_fiscal(r, period) for r in reports_base_40]) * P.taux40)
-        ri_rep = ri_rep + min_(P.max, sum([foyer_fiscal(r, period) for r in reports_base_25]) * P.taux25)
+        ri_rep = ri_rep + min_(investissement_2012.plafond, sum([foyer_fiscal(r, period) for r in reports_base_40]) * investissement_2009_2010.scellier_outremer.taux)
+        ri_rep = ri_rep + min_(investissement_2012.plafond, sum([foyer_fiscal(r, period) for r in reports_base_25]) * investissement_2009_2010.logement_BBC.taux)
 
-        base_ri_6 = min_(P.max, sum([foyer_fiscal(inv, period) for inv in inv_6]))
-        base_ri_5 = min_(P.max - base_ri_6, sum([foyer_fiscal(inv, period) for inv in inv_5]))
-        base_ri_4 = min_(P.max - base_ri_6 - base_ri_5, sum([foyer_fiscal(inv, period) for inv in inv_4]))
+        base_ri_6 = min_(investissement_2012.plafond, sum([foyer_fiscal(inv, period) for inv in inv_6]))
+        base_ri_5 = min_(investissement_2012.plafond - base_ri_6, sum([foyer_fiscal(inv, period) for inv in inv_5]))
+        base_ri_4 = min_(investissement_2012.plafond - base_ri_6 - base_ri_5, sum([foyer_fiscal(inv, period) for inv in inv_4]))
 
-        ri_6 = base_ri_6 * P09.taux_prorogation / 3
-        ri_5 = base_ri_5 * P11.taux_prorogation / 3
-        ri_4 = base_ri_4 * P12.taux_prorogation / 3
+        ri_6 = base_ri_6 * investissement_2009_2010.taux_prorogation / 3
+        ri_5 = base_ri_5 * investissement_2011.taux_prorogation / 3
+        ri_4 = base_ri_4 * investissement_2012.taux_prorogation / 3
 
         reductions = ri_rep + ri_6 + ri_5 + ri_4
 
@@ -4619,10 +4616,9 @@ class scelli(Variable):
         2019
         '''
 
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P09 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P11 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P12 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
+        investissement_2009_2010 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2011 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2012 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
 
         reports = [
             'f7rt', 'f7ru', 'f7rv', 'f7rw',
@@ -4677,13 +4673,13 @@ class scelli(Variable):
 
         ri_rep = sum([foyer_fiscal(rep, period) for rep in reports])
 
-        base_ri_6 = min_(P.max, sum([foyer_fiscal(inv, period) for inv in inv_6]))
-        base_ri_5 = min_(P.max - base_ri_6, sum([foyer_fiscal(inv, period) for inv in inv_5]))
-        base_ri_4 = min_(P.max - base_ri_6 - base_ri_5, sum([foyer_fiscal(inv, period) for inv in inv_4]))
+        base_ri_6 = min_(investissement_2012.plafond, sum([foyer_fiscal(inv, period) for inv in inv_6]))
+        base_ri_5 = min_(investissement_2012.plafond - base_ri_6, sum([foyer_fiscal(inv, period) for inv in inv_5]))
+        base_ri_4 = min_(investissement_2012.plafond - base_ri_6 - base_ri_5, sum([foyer_fiscal(inv, period) for inv in inv_4]))
 
-        ri_6 = base_ri_6 * P09.taux_prorogation / 3
-        ri_5 = base_ri_5 * P11.taux_prorogation / 3
-        ri_4 = base_ri_4 * P12.taux_prorogation / 3
+        ri_6 = base_ri_6 * investissement_2009_2010.taux_prorogation / 3
+        ri_5 = base_ri_5 * investissement_2011.taux_prorogation / 3
+        ri_4 = base_ri_4 * investissement_2012.taux_prorogation / 3
 
         reductions = ri_rep + ri_6 + ri_5 + ri_4
 
@@ -4695,10 +4691,9 @@ class scelli(Variable):
         2020
         '''
 
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P09 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P11 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P12 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
+        investissement_2009_2010 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2011 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2012 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
 
         reports = [
             'f7rt', 'f7ru', 'f7rv', 'f7rw',
@@ -4753,13 +4748,13 @@ class scelli(Variable):
 
         ri_rep = sum([foyer_fiscal(rep, period) for rep in reports])
 
-        base_ri_6 = min_(P.max, sum([foyer_fiscal(inv, period) for inv in inv_6]))
-        base_ri_5 = min_(P.max - base_ri_6, sum([foyer_fiscal(inv, period) for inv in inv_5]))
-        base_ri_4 = min_(P.max - base_ri_6 - base_ri_5, sum([foyer_fiscal(inv, period) for inv in inv_4]))
+        base_ri_6 = min_(investissement_2012.plafond, sum([foyer_fiscal(inv, period) for inv in inv_6]))
+        base_ri_5 = min_(investissement_2012.plafond - base_ri_6, sum([foyer_fiscal(inv, period) for inv in inv_5]))
+        base_ri_4 = min_(investissement_2012.plafond - base_ri_6 - base_ri_5, sum([foyer_fiscal(inv, period) for inv in inv_4]))
 
-        ri_6 = base_ri_6 * P09.taux_prorogation / 3
-        ri_5 = base_ri_5 * P11.taux_prorogation / 3
-        ri_4 = base_ri_4 * P12.taux_prorogation / 3
+        ri_6 = base_ri_6 * investissement_2009_2010.taux_prorogation / 3
+        ri_5 = base_ri_5 * investissement_2011.taux_prorogation / 3
+        ri_4 = base_ri_4 * investissement_2012.taux_prorogation / 3
 
         reductions = ri_rep + ri_6 + ri_5 + ri_4
 
@@ -4771,10 +4766,9 @@ class scelli(Variable):
         2021
         '''
 
-        P = parameters(period).impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P09 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P11 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
-        P12 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.scelli
+        investissement_2009_2010 = parameters('2009-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2011 = parameters('2011-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
+        investissement_2012 = parameters('2012-01-01').impot_revenu.calcul_reductions_impots.investissements_immobiliers.dispositif_scellier
 
         reports = [
             'f7rt', 'f7ru', 'f7rv', 'f7rw',
@@ -4840,13 +4834,13 @@ class scelli(Variable):
 
         ri_rep = sum([foyer_fiscal(rep, period) for rep in reports])
 
-        base_ri_6 = min_(P.max, sum([foyer_fiscal(inv, period) for inv in inv_6]))
-        base_ri_5 = min_(P.max - base_ri_6, sum([foyer_fiscal(inv, period) for inv in inv_5]))
-        base_ri_4 = min_(P.max - base_ri_6 - base_ri_5, sum([foyer_fiscal(inv, period) for inv in inv_4]))
+        base_ri_6 = min_(investissement_2012.plafond, sum([foyer_fiscal(inv, period) for inv in inv_6]))
+        base_ri_5 = min_(investissement_2012.plafond - base_ri_6, sum([foyer_fiscal(inv, period) for inv in inv_5]))
+        base_ri_4 = min_(investissement_2012.plafond - base_ri_6 - base_ri_5, sum([foyer_fiscal(inv, period) for inv in inv_4]))
 
-        ri_6 = base_ri_6 * P09.taux_prorogation / 3
-        ri_5 = base_ri_5 * P11.taux_prorogation / 3
-        ri_4 = base_ri_4 * P12.taux_prorogation / 3
+        ri_6 = base_ri_6 * investissement_2009_2010.taux_prorogation / 3
+        ri_5 = base_ri_5 * investissement_2011.taux_prorogation / 3
+        ri_4 = base_ri_4 * investissement_2012.taux_prorogation / 3
 
         reductions = ri_rep + ri_6 + ri_5 + ri_4
 
@@ -4872,7 +4866,7 @@ class sofica(Variable):
         max0 = min_(P.plafond_revenu_net_global * max_(rng, 0), P.plafond)
         max1 = max_(0, max0 - f7gn)
 
-        return P.taux_1 * min_(f7gn, max0) + P.taux_2 * min_(f7fn, max1)
+        return P.taux_majore_1 * min_(f7gn, max0) + P.taux_reduction_normal * min_(f7fn, max1)
 
     def formula_2017_01_01(foyer_fiscal, period, parameters):
         '''
@@ -4890,9 +4884,9 @@ class sofica(Variable):
         max2 = max_(0, max0 - f7gn)
 
         return (
-            P.taux_3 * min_(f7en, max0)
-            + P.taux_1 * min_(f7gn, max1)
-            + P.taux_2 * min_(f7fn, max2)
+            P.taux_majore_2 * min_(f7en, max0)
+            + P.taux_majore_1 * min_(f7gn, max1)
+            + P.taux_reduction_normal * min_(f7fn, max2)
             )