diff --git a/openfisca_france_firms/variables/bilan/actif/actif.py b/openfisca_france_firms/variables/bilan/actif/actif.py index 1564af8..da87441 100644 --- a/openfisca_france_firms/variables/bilan/actif/actif.py +++ b/openfisca_france_firms/variables/bilan/actif/actif.py @@ -18,12 +18,7 @@ def formula(UniteLegale, period): total_iv = UniteLegale("frais_emission_emprunt", period) total_v = UniteLegale("primes_remboursement_obligations", period) total_vi = UniteLegale("ecarts_conversion_actif", period) - total_general = (total_i + - total_ii + - total_iii + - total_iv + - total_v + - total_vi) + total_general = (total_i + total_ii + total_iii + total_iv + total_v + total_vi) return total_general @@ -39,8 +34,7 @@ class actif_ar(Variable): def formula(UniteLegale, period): total_ii = UniteLegale("actif_immobilise_ar", period) total_iii = UniteLegale("actif_total_iii_ar", period) - total_general = (total_ii + - total_iii) + total_general = (total_ii + total_iii) return total_general diff --git a/openfisca_france_firms/variables/bilan/actif/actif_circulant.py b/openfisca_france_firms/variables/bilan/actif/actif_circulant.py index f2fe149..137e5e9 100644 --- a/openfisca_france_firms/variables/bilan/actif/actif_circulant.py +++ b/openfisca_france_firms/variables/bilan/actif/actif_circulant.py @@ -178,13 +178,7 @@ def formula(UniteLegale, period): produits_inter = UniteLegale("produits_intermediaires_finis_bruts", period) marchandises = UniteLegale("marchandises_brutes", period) - stocks = ( - matieres_premieres - + encours_production_biens - + encours_production_services - + produits_inter - + marchandises - ) + stocks = (matieres_premieres + encours_production_biens + encours_production_services + produits_inter + marchandises) return stocks @@ -203,13 +197,7 @@ def formula(UniteLegale, period): produits_inter = UniteLegale("produits_intermediaires_finis_ar", period) marchandises = UniteLegale("marchandises_ar", period) - stocks = ( - matieres_premieres - + encours_production_biens - + encours_production_services - + produits_inter - + marchandises - ) + stocks = (matieres_premieres + encours_production_biens + encours_production_services + produits_inter + marchandises) return stocks @@ -369,11 +357,7 @@ def formula(UniteLegale, period): autres = UniteLegale("autres_creances_brutes", period) capital_souscrit_appele = UniteLegale("capital_souscrit_appele_non_verse_brut", period) - creances = ( - creances_clients - + autres - + capital_souscrit_appele - ) + creances = (creances_clients + autres + capital_souscrit_appele) return creances @@ -391,11 +375,7 @@ def formula(UniteLegale, period): autres = UniteLegale("autres_creances_ar", period) capital_souscrit_appele = UniteLegale("capital_souscrit_appele_non_verse_ar", period) - creances = ( - creances_clients - + autres - + capital_souscrit_appele - ) + creances = (creances_clients + autres + capital_souscrit_appele) return creances @@ -560,12 +540,7 @@ def formula(UniteLegale, period): creances = UniteLegale("creances_ar", period) divers = UniteLegale("actif_circulant_divers_ar", period) - actif_circulant = ( - stocks - + avances_acomptes_commandes - + creances - + divers - ) + actif_circulant = (stocks + avances_acomptes_commandes + creances + divers) return actif_circulant diff --git a/openfisca_france_firms/variables/bilan/actif/capital_souscrit_non_appele.py b/openfisca_france_firms/variables/bilan/actif/capital_souscrit_non_appele.py index f9daead..9f0edf9 100644 --- a/openfisca_france_firms/variables/bilan/actif/capital_souscrit_non_appele.py +++ b/openfisca_france_firms/variables/bilan/actif/capital_souscrit_non_appele.py @@ -3,6 +3,7 @@ from openfisca_core.variables import Variable from openfisca_france_firms.entities import UniteLegale # noqa F401 + class capital_souscrit_non_appele_brut(Variable): cerfa_field = "AA" value_type = int diff --git a/openfisca_france_firms/variables/taxes/taxation_energies/taxation_charbon.py b/openfisca_france_firms/variables/taxes/taxation_energies/taxation_charbon.py index 0e28e8d..c7c4f6c 100644 --- a/openfisca_france_firms/variables/taxes/taxation_energies/taxation_charbon.py +++ b/openfisca_france_firms/variables/taxes/taxation_energies/taxation_charbon.py @@ -16,6 +16,7 @@ # Import the Entities specifically defined for this tax and benefit system from openfisca_france_firms.entities import UniteLegale, Etablissement + class taxe_interieure_consommation_charbon(Variable): value_type = float entity = Etablissement @@ -33,6 +34,7 @@ def formula_2007_01_01(etablissement, period, parameters): return ticc + class assiette_ticc(Variable): value_type = float entity = Etablissement @@ -55,9 +57,7 @@ def formula_2007_01_01(etablissement, period, parameters): conso_combustible_electricite_266qA = etablissement("consommation_charbon_combustible_electricite_266qA", period) - assiette = consommation_charbon - (conso_non_combustible + - conso_double_usage + - conso_di26) - (conso_combustible_interne + (conso_combustible_prodelec - conso_combustible_electricite_266qA) + conso_combustible_extraction + conso_combustible_particuliers) + assiette = consommation_charbon - (conso_non_combustible + conso_double_usage + conso_di26) - (conso_combustible_interne + (conso_combustible_prodelec - conso_combustible_electricite_266qA) + conso_combustible_extraction + conso_combustible_particuliers) return assiette @@ -79,14 +79,8 @@ def formula_2008_01_01(etablissement, period, parameters): euets = etablissement("is_euets", period) - assiette = consommation_charbon - (conso_non_combustible + - conso_double_usage + - conso_di26) - (conso_combustible_interne + - (conso_combustible_prodelec - conso_combustible_electricite_266qA) + - conso_combustible_extraction + - conso_combustible_particuliers + - (conso_combustible_biomasse * euets)) - + assiette = consommation_charbon - (conso_non_combustible + conso_double_usage + conso_di26) - (conso_combustible_interne + (conso_combustible_prodelec - conso_combustible_electricite_266qA) + conso_combustible_extraction + conso_combustible_particuliers + (conso_combustible_biomasse * euets)) + return assiette def formula_2009_01_01(etablissement, period, parameters): @@ -111,17 +105,7 @@ def formula_2009_01_01(etablissement, period, parameters): chiffre_affaires = etablissement.unite_legale("chiffre_affaires", period) condition_facture = facture_energie >= .03 * chiffre_affaires - assiette = consommation_charbon - ( - conso_non_combustible + - conso_double_usage + - conso_di26 - ) - ( - conso_combustible_interne + ( - conso_combustible_prodelec - conso_combustible_electricite_266qA) + - conso_combustible_extraction + - conso_combustible_particuliers + - (conso_combustible_biomasse * euets * condition_facture) - ) + assiette = consommation_charbon - (conso_non_combustible + conso_double_usage + conso_di26) - (conso_combustible_interne + (conso_combustible_prodelec - conso_combustible_electricite_266qA) + conso_combustible_extraction + conso_combustible_particuliers + (conso_combustible_biomasse * euets * condition_facture)) return assiette @@ -149,12 +133,7 @@ def formula_2011_01_01(etablissement, period, parameters): chiffre_affaires = etablissement.unite_legale("chiffre_affaires", period) condition_facture = facture_energie >= .03 * chiffre_affaires - assiette = consommation_charbon - (conso_non_combustible + - conso_double_usage + - conso_di26) - (conso_combustible_interne + (conso_combustible_prodelec - conso_combustible_electricite_266qA - conso_combustible_electricite_petits_producteurs) + - conso_combustible_extraction + - conso_combustible_particuliers + - (conso_combustible_biomasse * euets * condition_facture)) + assiette = consommation_charbon - (conso_non_combustible + conso_double_usage + conso_di26) - (conso_combustible_interne + (conso_combustible_prodelec - conso_combustible_electricite_266qA - conso_combustible_electricite_petits_producteurs) + conso_combustible_extraction + conso_combustible_particuliers + (conso_combustible_biomasse * euets * condition_facture)) return assiette @@ -183,17 +162,7 @@ def formula_2011_01_01(etablissement, period, parameters): chiffre_affaires = etablissement.unite_legale("chiffre_affaires", period) condition_facture = facture_energie >= .03 * chiffre_affaires - assiette = consommation_charbon - ( - conso_non_combustible + - conso_double_usage + - conso_di26 - ) - ( - conso_combustible_interne + ( - conso_combustible_prodelec - (conso_combustible_electricite_266qA * contrat_achat_electricite_314) - conso_combustible_electricite_petits_producteurs) + - conso_combustible_extraction + - conso_combustible_particuliers + - (conso_combustible_biomasse * euets * condition_facture) - ) + assiette = consommation_charbon - (conso_non_combustible + conso_double_usage + conso_di26) - (conso_combustible_interne + (conso_combustible_prodelec - (conso_combustible_electricite_266qA * contrat_achat_electricite_314) - conso_combustible_electricite_petits_producteurs) + conso_combustible_extraction + conso_combustible_particuliers + (conso_combustible_biomasse * euets * condition_facture)) return assiette @@ -221,16 +190,7 @@ def formula_2014_04_01(etablissement, period, parameters): chiffre_affaires = etablissement.unite_legale("chiffre_affaires", period) condition_facture = facture_energie >= .03 * chiffre_affaires - assiette = consommation_charbon - ( - conso_non_combustible + - conso_double_usage + - conso_di26 - ) - ( - conso_combustible_interne + ( - conso_combustible_prodelec - (conso_combustible_electricite_266qA * contrat_achat_electricite_314) - conso_combustible_electricite_petits_producteurs) + - conso_combustible_extraction + - (conso_combustible_biomasse * euets * condition_facture) - ) + assiette = consommation_charbon - (conso_non_combustible + conso_double_usage + conso_di26) - (conso_combustible_interne + (conso_combustible_prodelec - (conso_combustible_electricite_266qA * contrat_achat_electricite_314) - conso_combustible_electricite_petits_producteurs) + conso_combustible_extraction + (conso_combustible_biomasse * euets * condition_facture)) return assiette @@ -259,16 +219,7 @@ def formula_2014_04_01(etablissement, period, parameters): chiffre_affaires = etablissement.unite_legale("chiffre_affaires", period) condition_facture = facture_energie >= .03 * chiffre_affaires - assiette = consommation_charbon - ( - conso_non_combustible + - conso_double_usage + - conso_di26 - ) - ( - conso_combustible_interne + ( - conso_combustible_prodelec - (conso_combustible_electricite_266qA * contrat_achat_electricite_314) - conso_combustible_electricite_petits_producteurs) + - conso_combustible_extraction + - (conso_combustible_biomasse * euets * condition_facture) - ) + assiette = consommation_charbon - (conso_non_combustible + conso_double_usage + conso_di26) - (conso_combustible_interne + (conso_combustible_prodelec - (conso_combustible_electricite_266qA * contrat_achat_electricite_314) - conso_combustible_electricite_petits_producteurs) + conso_combustible_extraction + (conso_combustible_biomasse * euets * condition_facture)) return assiette @@ -298,7 +249,6 @@ def formula_2020_01_01(etablissement, period, parameters): chiffre_affaires = etablissement.unite_legale("chiffre_affaires", period) condition_facture = facture_energie >= .03 * chiffre_affaires - assiette = consommation_charbon - (conso_non_combustible - (conso_carburant * installation_cogeneration) + conso_double_usage + conso_di26) - (conso_combustible_interne + - (conso_combustible_prodelec - conso_combustible_electricite_petits_producteurs) + conso_combustible_extraction + (conso_combustible_biomasse * euets * condition_facture)) + assiette = consommation_charbon - (conso_non_combustible - (conso_carburant * installation_cogeneration) + conso_double_usage + conso_di26) - (conso_combustible_interne + (conso_combustible_prodelec - conso_combustible_electricite_petits_producteurs) + conso_combustible_extraction + (conso_combustible_biomasse * euets * condition_facture)) return assiette diff --git a/openfisca_france_firms/variables/taxes/taxation_energies/taxation_gaz_naturel.py b/openfisca_france_firms/variables/taxes/taxation_energies/taxation_gaz_naturel.py index 7e17cfd..320ab40 100644 --- a/openfisca_france_firms/variables/taxes/taxation_energies/taxation_gaz_naturel.py +++ b/openfisca_france_firms/variables/taxes/taxation_energies/taxation_gaz_naturel.py @@ -16,6 +16,7 @@ # Import the Entities specifically defined for this tax and benefit system from openfisca_france_firms.entities import UniteLegale, Etablissement + class taxe_interieure_consommation_gaz_naturel(Variable): value_type = float entity = Etablissement @@ -48,9 +49,7 @@ def formula_2015_01_01(etablissement, period, parameters): ticgn_grande_conso = etablissement("taxe_interieure_consommation_gaz_naturel_grande_consommatrice", period) ticgn_electrointensive = etablissement("taxe_interieure_consommation_gaz_naturel_electrointensive", period) - ticgn = (euets * grande_consommatrice * ticgn_grande_conso) + ( - (1 - euets) * electrointensive * risque_fuite * ticgn_electrointensive) + ( - (1 - ((euets * grande_consommatrice) + ((1 - euets) * electrointensive * risque_fuite))) * ticgn_normal) + ticgn = (euets * grande_consommatrice * ticgn_grande_conso) + ((1 - euets) * electrointensive * risque_fuite * ticgn_electrointensive) + ((1 - ((euets * grande_consommatrice) + ((1 - euets) * electrointensive * risque_fuite))) * ticgn_normal) return ticgn @@ -111,7 +110,7 @@ def formula_2014_04_01(etablissement, period, parameters): taux = parameters("2013-12-31").taxation_energies.natural_gas taxe = assiette * taux - return tax + return taxe def formula_2016_04_01(etablissement, period, parameters): """ @@ -126,6 +125,7 @@ def formula_2016_04_01(etablissement, period, parameters): return taxe + class taxe_interieure_consommation_gaz_naturel_electrointensive(Variable): value_type = float entity = Etablissement @@ -159,6 +159,7 @@ def formula_2016_01_01(etablissement, period, parameters): return taxe + class assiette_ticgn(Variable): value_type = float entity = Etablissement @@ -261,6 +262,7 @@ def formula_2020_01_01(etablissement, period, parameters): return conso + class taxe_interieure_consommation_gaz_naturel_ifp(Variable): value_type = float entity = Etablissement @@ -274,4 +276,5 @@ def formula(etablissement, period, parameters): The formula to compute the income tax for a given etablissement at a given period """ - return etablissement("gas_consumption", period) * parameters(period).taxation_energies.natural_gas + + return etablissement("consommation_gaz_naturel", period) * parameters(period).taxation_energies.natural_gas