diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py index 07dad4c1b96..5ebc345f36a 100644 --- a/addons/account/models/chart_template.py +++ b/addons/account/models/chart_template.py @@ -557,8 +557,6 @@ class AccountChartTemplate(models.AbstractModel): 'property_account_payable_id': 'res.partner', 'property_account_expense_categ_id': 'product.category', 'property_account_income_categ_id': 'product.category', - 'property_account_expense_id': 'product.template', - 'property_account_income_id': 'product.template', 'property_stock_journal': 'product.category', }.items(): value = template_data.get(field) diff --git a/addons/account/models/template_generic_coa.py b/addons/account/models/template_generic_coa.py index 24aa033e217..0ab90600f23 100644 --- a/addons/account/models/template_generic_coa.py +++ b/addons/account/models/template_generic_coa.py @@ -21,8 +21,6 @@ class AccountChartTemplate(models.AbstractModel): 'country': None, 'property_account_receivable_id': 'receivable', 'property_account_payable_id': 'payable', - 'property_account_expense_id': 'expense', - 'property_account_income_id': 'income', 'property_account_expense_categ_id': 'expense', 'property_account_income_categ_id': 'income', 'property_stock_account_input_categ_id': 'stock_in', diff --git a/addons/l10n_bo/models/template_bo.py b/addons/l10n_bo/models/template_bo.py index fc78c995264..741d810bb1d 100644 --- a/addons/l10n_bo/models/template_bo.py +++ b/addons/l10n_bo/models/template_bo.py @@ -15,8 +15,6 @@ class AccountChartTemplate(models.AbstractModel): 'property_account_payable_id': 'l10n_bo_2121', 'property_account_expense_categ_id': 'l10n_bo_53008', 'property_account_income_categ_id': 'l10n_bo_4101', - 'property_account_expense_id': 'l10n_bo_53008', - 'property_account_income_id': 'l10n_bo_4101', 'property_stock_account_input_categ_id': 'l10n_bo_11341', 'property_stock_account_output_categ_id': 'l10n_bo_11342', 'property_stock_valuation_account_id': 'l10n_bo_1131', diff --git a/addons/l10n_cz/models/template_cz.py b/addons/l10n_cz/models/template_cz.py index 403d508aa0c..d169284d8e7 100644 --- a/addons/l10n_cz/models/template_cz.py +++ b/addons/l10n_cz/models/template_cz.py @@ -15,8 +15,6 @@ class AccountChartTemplate(models.AbstractModel): 'property_account_payable_id': 'chart_cz_321000', 'property_account_expense_categ_id': 'chart_cz_504000', 'property_account_income_categ_id': 'chart_cz_604000', - 'property_account_expense_id': 'chart_cz_504000', - 'property_account_income_id': 'chart_cz_604000', 'property_stock_account_input_categ_id': 'chart_cz_131000', 'property_stock_account_output_categ_id': 'chart_cz_504000', 'property_stock_valuation_account_id': 'chart_cz_132000', diff --git a/addons/l10n_dk/models/template_dk.py b/addons/l10n_dk/models/template_dk.py index 451700a810c..62e33422d0c 100644 --- a/addons/l10n_dk/models/template_dk.py +++ b/addons/l10n_dk/models/template_dk.py @@ -11,8 +11,6 @@ class AccountChartTemplate(models.AbstractModel): return { 'property_account_receivable_id': 'dk_coa_5960', 'property_account_payable_id': 'dk_coa_7180', - 'property_account_expense_id': 'dk_coa_1610', - 'property_account_income_id': 'dk_coa_1010', 'property_account_expense_categ_id': 'dk_coa_1610', 'property_account_income_categ_id': 'dk_coa_1010', 'property_tax_payable_account_id': 'dk_coa_7840', diff --git a/addons/l10n_ec/models/template_ec.py b/addons/l10n_ec/models/template_ec.py index 4f20251fb6a..0eefbac83ac 100644 --- a/addons/l10n_ec/models/template_ec.py +++ b/addons/l10n_ec/models/template_ec.py @@ -13,7 +13,6 @@ class AccountChartTemplate(models.AbstractModel): 'property_account_payable_id': 'ec210301', 'property_account_expense_categ_id': 'ec110307', 'property_account_income_categ_id': 'ec410201', - 'property_account_expense_id': 'ec_expense_others', 'property_stock_account_input_categ_id': 'ec110307', 'property_stock_account_output_categ_id': 'ec510102', 'property_stock_valuation_account_id': 'ec110306', diff --git a/addons/l10n_eg/models/template_eg.py b/addons/l10n_eg/models/template_eg.py index c28d87c7e1e..c146644be23 100644 --- a/addons/l10n_eg/models/template_eg.py +++ b/addons/l10n_eg/models/template_eg.py @@ -14,9 +14,7 @@ class AccountChartTemplate(models.AbstractModel): 'property_account_payable_id': 'egy_account_201002', 'property_account_expense_categ_id': 'egy_account_400028', 'property_account_income_categ_id': 'egy_account_500001', - 'property_account_expense_id': 'egy_account_400028', - 'property_account_income_id': 'egy_account_500001', - } + } @template('eg', 'res.company') def _get_eg_res_company(self): diff --git a/addons/l10n_fi/models/template_fi.py b/addons/l10n_fi/models/template_fi.py index 7637d4ce335..029d99db9fd 100644 --- a/addons/l10n_fi/models/template_fi.py +++ b/addons/l10n_fi/models/template_fi.py @@ -14,9 +14,7 @@ class AccountChartTemplate(models.AbstractModel): 'property_account_payable_id': 'account_2870', 'property_account_expense_categ_id': 'account_4000', 'property_account_income_categ_id': 'account_3000', - 'property_account_expense_id': 'account_4000', - 'property_account_income_id': 'account_3000', - } + } @template('fi', 'res.company') def _get_fi_res_company(self): diff --git a/addons/l10n_jp/models/template_jp.py b/addons/l10n_jp/models/template_jp.py index 188513461b3..920365e152b 100644 --- a/addons/l10n_jp/models/template_jp.py +++ b/addons/l10n_jp/models/template_jp.py @@ -12,8 +12,6 @@ class AccountChartTemplate(models.AbstractModel): 'code_digits': '6', 'property_account_receivable_id': 'l10n_jp_126000', 'property_account_payable_id': 'l10n_jp_220000', - 'property_account_expense_id': 'l10n_jp_510000', - 'property_account_income_id': 'l10n_jp_410000', 'property_account_expense_categ_id': 'l10n_jp_510000', 'property_account_income_categ_id': 'l10n_jp_410000', 'property_stock_valuation_account_id': 'l10n_jp_121100', diff --git a/addons/l10n_no/models/template_no.py b/addons/l10n_no/models/template_no.py index 96cb40a6ddd..7e697edfc4c 100644 --- a/addons/l10n_no/models/template_no.py +++ b/addons/l10n_no/models/template_no.py @@ -14,8 +14,6 @@ class AccountChartTemplate(models.AbstractModel): 'property_account_payable_id': 'chart2400', 'property_account_expense_categ_id': 'chart4000', 'property_account_income_categ_id': 'chart3000', - 'property_account_expense_id': 'chart4300', - 'property_account_income_id': 'chart3000', 'property_tax_payable_account_id': 'chart2740', 'property_tax_receivable_account_id': 'chart2740', } diff --git a/addons/l10n_pe/models/template_pe.py b/addons/l10n_pe/models/template_pe.py index 36c51b421e4..084f2fdc0eb 100644 --- a/addons/l10n_pe/models/template_pe.py +++ b/addons/l10n_pe/models/template_pe.py @@ -12,7 +12,6 @@ class AccountChartTemplate(models.AbstractModel): 'property_account_receivable_id': 'chart1213', 'property_account_payable_id': 'chart4212', 'property_account_expense_categ_id': 'chart6329', - 'property_account_expense_id': 'chart6011', 'property_account_income_categ_id': 'chart70121', 'property_stock_account_input_categ_id': 'chart6111', 'property_stock_account_output_categ_id': 'chart69111', diff --git a/addons/l10n_pt/models/template_pt.py b/addons/l10n_pt/models/template_pt.py index 0db2abc8d4c..0de3d17fbeb 100644 --- a/addons/l10n_pt/models/template_pt.py +++ b/addons/l10n_pt/models/template_pt.py @@ -11,8 +11,6 @@ class AccountChartTemplate(models.AbstractModel): return { 'property_account_receivable_id': 'chart_2111', 'property_account_payable_id': 'chart_2211', - 'property_account_expense_id': 'chart_311', - 'property_account_income_id': 'chart_711', 'property_account_income_categ_id': 'chart_711', 'property_account_expense_categ_id': 'chart_311', 'property_tax_payable_account_id': 'chart_2436', diff --git a/addons/l10n_sk/models/template_sk.py b/addons/l10n_sk/models/template_sk.py index cc8e5ce220f..bc9d2fa323b 100644 --- a/addons/l10n_sk/models/template_sk.py +++ b/addons/l10n_sk/models/template_sk.py @@ -15,8 +15,6 @@ class AccountChartTemplate(models.AbstractModel): 'property_account_payable_id': 'chart_sk_321000', 'property_account_expense_categ_id': 'chart_sk_504000', 'property_account_income_categ_id': 'chart_sk_604000', - 'property_account_expense_id': 'chart_sk_504000', - 'property_account_income_id': 'chart_sk_604000', 'property_stock_account_input_categ_id': 'chart_sk_131000', 'property_stock_account_output_categ_id': 'chart_sk_504000', 'property_stock_valuation_account_id': 'chart_sk_132000',