diff --git a/openfisca_france_indirect_taxation/variables/taxes_indirectes/prix_carburants_ht.py b/openfisca_france_indirect_taxation/variables/taxes_indirectes/prix_carburants_ht.py index e2e11d3a..1efef281 100644 --- a/openfisca_france_indirect_taxation/variables/taxes_indirectes/prix_carburants_ht.py +++ b/openfisca_france_indirect_taxation/variables/taxes_indirectes/prix_carburants_ht.py @@ -153,6 +153,9 @@ def formula(menage, period, parameters): prix_gazole_b10_ht = prix_gazole_b10_ht_avant_remise - (aide_exceptionnelle_gazole_essence_hl / 100) return prix_gazole_b10_ht + def formula_2023(menage, period): + return menage('prix_gazole_b10_ht_avant_remise', period) + class prix_essence_sp95_e10_ht_avant_remise(Variable): value_type = float @@ -282,6 +285,9 @@ def formula(menage, period, parameters): prix_essence_sp95_e10_hors_remise_ttc = prix_essence_sp95_e10_ht_avant_remise - (aide_exceptionnelle_gazole_essence_hl / 100) return prix_essence_sp95_e10_hors_remise_ttc + def formula_2023(menage, period): + return menage('prix_essence_sp95_e10_ht_avant_remise', period) + class prix_essence_sp95_ht_avant_remise(Variable): value_type = float @@ -411,6 +417,9 @@ def formula(menage, period, parameters): prix_essence_sp95_hors_remise_ttc = prix_essence_sp95_ht_avant_remise - (aide_exceptionnelle_gazole_essence_hl / 100) return prix_essence_sp95_hors_remise_ttc + def formula_2023(menage, period): + return menage('prix_essence_sp95_ht_avant_remise', period) + class prix_essence_sp98_ht_avant_remise(Variable): value_type = float diff --git a/openfisca_france_indirect_taxation/variables/taxes_indirectes/prix_carburants_ttc.py b/openfisca_france_indirect_taxation/variables/taxes_indirectes/prix_carburants_ttc.py index de422450..847e747c 100644 --- a/openfisca_france_indirect_taxation/variables/taxes_indirectes/prix_carburants_ttc.py +++ b/openfisca_france_indirect_taxation/variables/taxes_indirectes/prix_carburants_ttc.py @@ -36,6 +36,9 @@ def formula(menage, period, parameters): taux_plein_tva = parameters(period).imposition_indirecte.tva.taux_de_tva.taux_normal prix_gazole_b7_hors_remise_ttc = prix_gazole_b7_ttc + (aide_exceptionnelle_gazole_essence_hl / 100) * (1 + taux_plein_tva) return prix_gazole_b7_hors_remise_ttc + + def formula_2023(menage, period): + return menage('prix_gazole_b7_ttc', period) class prix_gazole_b10_ttc(Variable): # ATTENTION: pas de prix disponible pour gazole B10, on utilise prix du gazole B7 @@ -69,6 +72,9 @@ def formula(menage, period, parameters): taux_plein_tva = parameters(period).imposition_indirecte.tva.taux_de_tva.taux_normal prix_gazole_b10_hors_remise_ttc = prix_gazole_b10_ttc + (aide_exceptionnelle_gazole_essence_hl / 100) * (1 + taux_plein_tva) return prix_gazole_b10_hors_remise_ttc + + def formula_2023(menage, period): + return menage('prix_gazole_b10_ttc', period) class prix_essence_sp95_e10_ttc(Variable): @@ -102,6 +108,9 @@ def formula(menage, period, parameters): taux_plein_tva = parameters(period).imposition_indirecte.tva.taux_de_tva.taux_normal prix_essence_sp95_e10_ttc = prix_essence_sp95_e10_ttc + (aide_exceptionnelle_gazole_essence_hl / 100) * (1 + taux_plein_tva) return prix_essence_sp95_e10_ttc + + def formula_2023(menage, period): + return menage('prix_essence_sp95_e10_ttc', period) class prix_essence_sp95_ttc(Variable): @@ -135,6 +144,9 @@ def formula(menage, period, parameters): taux_plein_tva = parameters(period).imposition_indirecte.tva.taux_de_tva.taux_normal prix_essence_sp95_ttc = prix_essence_sp95_ttc + (aide_exceptionnelle_gazole_essence_hl / 100) * (1 + taux_plein_tva) return prix_essence_sp95_ttc + + def formula_2023(menage, period): + return menage('prix_essence_sp95_ttc', period) class prix_essence_sp98_ttc(Variable): @@ -168,6 +180,9 @@ def formula(menage, period, parameters): taux_plein_tva = parameters(period).imposition_indirecte.tva.taux_de_tva.taux_normal prix_essence_sp98_ttc = prix_essence_sp98_ttc + (aide_exceptionnelle_gazole_essence_hl / 100) * (1 + taux_plein_tva) return prix_essence_sp98_ttc + + def formula_2023(menage, period): + return menage('prix_essence_sp98_ttc', period) class prix_essence_super_plombe_ttc(Variable): # ATTENTION: pas prix par région disponible, on garde les prix TTC général de l'IPP. (INSEE) @@ -215,6 +230,9 @@ def formula(menage, period, parameters): taux_plein_tva = parameters(period).imposition_indirecte.tva.taux_de_tva.taux_normal prix_essence_e85_hors_remise_ttc = prix_essence_e85_ttc + (aide_exceptionnelle_gazole_essence_hl / 100) * (1 + taux_plein_tva) return prix_essence_e85_hors_remise_ttc + + def formula_2023(menage, period): + return menage('prix_essence_e85_ttc', period) class prix_gpl_carburant_ttc(Variable): diff --git a/openfisca_france_indirect_taxation/variables/taxes_indirectes/prix_carburants_ttc_sortie.py b/openfisca_france_indirect_taxation/variables/taxes_indirectes/prix_carburants_ttc_sortie.py index c1f7e333..3eeb7e6e 100644 --- a/openfisca_france_indirect_taxation/variables/taxes_indirectes/prix_carburants_ttc_sortie.py +++ b/openfisca_france_indirect_taxation/variables/taxes_indirectes/prix_carburants_ttc_sortie.py @@ -112,6 +112,9 @@ def formula(menage, period, parameters): taux_plein_tva = parameters(period).imposition_indirecte.tva.taux_de_tva.taux_normal prix_gazole_b7_hors_remise_ttc = prix_gazole_b7_ttc + (aide_exceptionnelle_gazole_essence_hl / 100) * (1 + taux_plein_tva) return prix_gazole_b7_hors_remise_ttc + + def formula_2023(menage, period): + return menage('prix_gazole_b7_ttc_sortie', period) class prix_gazole_b10_ttc_sortie(Variable): @@ -153,6 +156,9 @@ def formula(menage, period, parameters): taux_plein_tva = parameters(period).imposition_indirecte.tva.taux_de_tva.taux_normal prix_gazole_b10_hors_remise_ttc = prix_gazole_b10_ttc + (aide_exceptionnelle_gazole_essence_hl / 100) * (1 + taux_plein_tva) return prix_gazole_b10_hors_remise_ttc + + def formula_2023(menage, period): + return menage('prix_gazole_b10_ttc_sortie', period) class prix_essence_sp95_e10_ttc_sortie(Variable): @@ -283,6 +289,9 @@ def formula(menage, period, parameters): taux_plein_tva = parameters(period).imposition_indirecte.tva.taux_de_tva.taux_normal prix_essence_sp95_e10_ttc = prix_essence_sp95_e10_ttc + (aide_exceptionnelle_gazole_essence_hl / 100) * (1 + taux_plein_tva) return prix_essence_sp95_e10_ttc + + def formula_2023(menage, period): + return menage('prix_essence_sp95_e10_ttc_sortie', period) class prix_essence_sp95_ttc_sortie(Variable): @@ -413,6 +422,9 @@ def formula(menage, period, parameters): taux_plein_tva = parameters(period).imposition_indirecte.tva.taux_de_tva.taux_normal prix_essence_sp95_ttc = prix_essence_sp95_ttc + (aide_exceptionnelle_gazole_essence_hl / 100) * (1 + taux_plein_tva) return prix_essence_sp95_ttc + + def formula_2023(menage, period): + return menage('prix_essence_sp95_ttc_sortie', period) class prix_essence_sp98_ttc_sortie(Variable): @@ -543,6 +555,9 @@ def formula(menage, period, parameters): taux_plein_tva = parameters(period).imposition_indirecte.tva.taux_de_tva.taux_normal prix_essence_sp98_ttc = prix_essence_sp98_ttc + (aide_exceptionnelle_gazole_essence_hl / 100) * (1 + taux_plein_tva) return prix_essence_sp98_ttc + + def formula_2023(menage, period): + return menage('prix_essence_sp98_ttc_sortie', period) class prix_essence_super_plombe_ttc_sortie(Variable): @@ -605,6 +620,9 @@ def formula(menage, period, parameters): taux_plein_tva = parameters(period).imposition_indirecte.tva.taux_de_tva.taux_normal prix_essence_e85_hors_remise_ttc = prix_essence_e85_ttc + (aide_exceptionnelle_gazole_essence_hl / 100) * (1 + taux_plein_tva) return prix_essence_e85_hors_remise_ttc + + def formula_2023(menage, period): + return menage('prix_essence_e85_ttc_sortie', period) class prix_gpl_carburant_ttc_sortie(Variable):