Fix decote

Simulation_engine/reforms.py

@@ -18,12 +18,15 @@ class IncomeTaxReform(Reform):
     """Une réforme de l'impôt sur le revenu"""
 
     def __init__(self, tbs: FranceTaxBenefitSystem, payload: dict, period: str) -> None:
+        logger.debug("IncomeTaxReform->init")
         self.payload = payload.get("impot_revenu", {})
+        # logger.debug(f'IncomeTaxReform {self.payload.get("calcul_impot_revenu")}')
         self.instant = periods.instant(period)
         self.period = periods.period("year:1900:200")
         super().__init__(tbs)
 
     def modifier(self, parameters: ParameterNode) -> ParameterNode:
+        logger.debug("IncomeTaxReform->modifier")
         reform = ParametricReform(parameters, self.payload, self.instant, self.period)
         parameters, *_ = compose(*reforms(mapping(), self.payload))(reform)
         return parameters
@@ -53,10 +56,10 @@ def reforms(mapping: dict, payload: dict) -> tuple:
 
 def mapping() -> dict:
     return {
-        "decote": decote,
         "bareme_ir_depuis_1945": bareme,
+        "calcul_impot_revenu": compose(plaf_qf, decote, abat_dom, reduction_ss_condition_revenus),
+        # TODO: Changer en abat_rni et l'implémenter dans le front
         "abattements_rni": abattements_rni,
-        "plaf_qf": compose(plaf_qf, abat_dom, reduction_ss_condition_revenus),
     }
 
 
@@ -90,6 +93,7 @@ def bareme(reform: T) -> T:
 
 
 def decote(reform: T) -> T:
+    logger.debug("decote")
     logger.debug(reform.payload)
     if reform.payload.get("bareme"):
         logger.debug(reform.payload)

Simulation_engine/simulate_pop_from_reform.py

@@ -1060,7 +1060,9 @@ def CompareOldNew(taux=None, isdecile=True, dictreform=None, castypedesc=None):
         if castypedesc is None
         else simulation_from_cas_types(castypedesc)
     )
+    # logging.debug(dictreform)
     reform = IncomeTaxReform(TBS, dictreform, PERIOD)
+    # logging.debug( reform.parameters("2023").impot_revenu.calcul_impot_revenu.plaf_qf)
     simulation_reform = simulation(PERIOD, data, reform)
     default_sims["apres"] = simulation_reform