From 084408a9bb26dcc1ac54986802b08638c72b6235 Mon Sep 17 00:00:00 2001 From: "Daniel Kosky (dako)" Date: Wed, 2 Aug 2023 17:02:12 +0000 Subject: [PATCH] [FIX] l10n_*: set default taxes The default taxes for most localisations have been left undefined by default. When loading the chart template, the model generally selects the first sales and purchase taxes, based on the order in which the taxes appear in the csv, for the default sales and purchase taxes respectively. This behaviour can be confusing to those who are not yet familiar with it. It has been decided that it is preferable instead to specify the default tax in _get_*_res_company function on the account chart template model, such that the default taxes are defined explicitly for every localisation. task-3453997 closes odoo/odoo#130733 Related: odoo/enterprise#45531 Signed-off-by: Brice Bartoletti (bib) --- addons/l10n_ae/models/template_ae.py | 11 +++++++ addons/l10n_ar/models/template_ar_ri.py | 2 ++ addons/l10n_at/models/template_at.py | 2 ++ addons/l10n_au/models/template_au.py | 2 ++ addons/l10n_be/models/template_be.py | 2 ++ addons/l10n_bg/models/template_bg.py | 2 ++ addons/l10n_bo/models/template_bo.py | 2 ++ addons/l10n_br/models/template_br.py | 2 ++ addons/l10n_ca/models/template_ca.py | 31 +++++++------------ addons/l10n_ch/models/template_ch.py | 2 ++ addons/l10n_cl/models/template_cl.py | 2 ++ addons/l10n_cn/models/template_cn.py | 2 ++ addons/l10n_co/models/template_co.py | 2 ++ addons/l10n_cr/models/template_cr.py | 2 ++ addons/l10n_cz/models/template_cz.py | 2 ++ addons/l10n_de/models/template_de_skr03.py | 2 ++ addons/l10n_de/models/template_de_skr04.py | 2 ++ addons/l10n_dk/models/template_dk.py | 2 ++ addons/l10n_do/models/template_do.py | 2 ++ addons/l10n_dz/models/template_dz.py | 2 ++ addons/l10n_ec/models/template_ec.py | 2 ++ addons/l10n_ee/models/template_ee.py | 2 ++ addons/l10n_eg/models/template_eg.py | 2 ++ addons/l10n_es/models/template_es_assec.py | 2 ++ addons/l10n_es/models/template_es_common.py | 2 ++ addons/l10n_es/models/template_es_full.py | 2 ++ addons/l10n_es/models/template_es_pymes.py | 2 ++ addons/l10n_et/models/template_et.py | 2 ++ addons/l10n_fi/models/template_fi.py | 2 ++ addons/l10n_fr/models/template_fr.py | 2 ++ addons/l10n_gr/models/template_gr.py | 2 ++ addons/l10n_gt/models/template_gt.py | 3 ++ addons/l10n_hn/models/template_hn.py | 2 ++ addons/l10n_hr/models/template_hr.py | 2 ++ addons/l10n_hu/models/template_hu.py | 2 ++ addons/l10n_id/models/template_id.py | 2 ++ addons/l10n_ie/models/template_ie.py | 2 ++ addons/l10n_il/models/template_il.py | 2 ++ addons/l10n_in/models/template_in.py | 2 ++ addons/l10n_in_edi/tests/test_edi_json.py | 21 ++++++++----- addons/l10n_it/models/template_it.py | 2 ++ addons/l10n_it_edi/models/__init__.py | 1 - .../models/account_chart_template.py | 18 ----------- addons/l10n_jp/models/template_jp.py | 2 ++ addons/l10n_ke/models/template_ke.py | 2 ++ addons/l10n_kz/models/template_kz.py | 2 ++ addons/l10n_lt/models/template_lt.py | 2 ++ addons/l10n_lu/models/template_lu.py | 2 ++ addons/l10n_lv/models/template_lv.py | 2 ++ addons/l10n_ma/models/template_ma.py | 2 ++ addons/l10n_mn/models/template_mn.py | 2 ++ addons/l10n_mx/models/template_mx.py | 2 ++ addons/l10n_my/models/template_my.py | 1 + addons/l10n_mz/models/template_mz.py | 2 ++ addons/l10n_nl/models/template_nl.py | 2 ++ addons/l10n_no/models/template_no.py | 2 ++ addons/l10n_nz/models/template_nz.py | 2 ++ addons/l10n_pa/models/template_pa.py | 2 ++ addons/l10n_pe/models/template_pe.py | 2 ++ addons/l10n_ph/models/template_ph.py | 2 ++ addons/l10n_pk/models/template_pk.py | 2 ++ addons/l10n_pt/models/template_pt.py | 2 ++ addons/l10n_ro/models/template_ro.py | 2 ++ addons/l10n_rs/models/template_rs.py | 2 ++ addons/l10n_sa/models/template_sa.py | 2 ++ addons/l10n_se/models/template_se.py | 2 ++ addons/l10n_sg/models/template_sg.py | 2 ++ addons/l10n_si/models/template_si.py | 2 ++ addons/l10n_sk/models/template_sk.py | 2 ++ .../models/template_syscohada.py | 2 ++ addons/l10n_th/models/template_th.py | 2 ++ addons/l10n_tn/models/template_tn.py | 2 ++ addons/l10n_tr/models/template_tr.py | 2 ++ addons/l10n_tw/models/template_tw.py | 2 ++ addons/l10n_ua/models/template_ua_ias.py | 2 ++ addons/l10n_ua/models/template_ua_psbo.py | 2 ++ addons/l10n_uk/models/template_uk.py | 2 ++ addons/l10n_uy/models/template_uy.py | 2 ++ addons/l10n_ve/models/template_ve.py | 2 ++ addons/l10n_vn/models/template_vn.py | 2 ++ addons/l10n_za/models/template_za.py | 2 ++ 81 files changed, 189 insertions(+), 45 deletions(-) delete mode 100644 addons/l10n_it_edi/models/account_chart_template.py diff --git a/addons/l10n_ae/models/template_ae.py b/addons/l10n_ae/models/template_ae.py index 25f403ff91b..6fa372e71b3 100644 --- a/addons/l10n_ae/models/template_ae.py +++ b/addons/l10n_ae/models/template_ae.py @@ -20,6 +20,15 @@ class AccountChartTemplate(models.AbstractModel): @template('ae', 'res.company') def _get_ae_res_company(self): + sales_tax_xmlid = { + 'AZ': 'uae_sale_tax_5_abu_dhabi', + 'AJ': 'uae_sale_tax_5_ajman', + 'DU': 'uae_sale_tax_5_dubai', + 'FU': 'uae_sale_tax_5_fujairah', + 'RK': 'uae_sale_tax_5_ras_al_khaima', + 'SH': 'uae_sale_tax_5_sharjah', + 'UQ': 'uae_sale_tax_5_umm_al_quwain', + }.get(self.env.company.state_id.code, 'uae_sale_tax_5_abu_dhabi') return { self.env.company.id: { 'account_fiscal_country_id': 'base.ae', @@ -31,6 +40,8 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'uae_account_400053', 'account_journal_early_pay_discount_loss_account_id': 'uae_account_400071', 'account_journal_early_pay_discount_gain_account_id': 'uae_account_500014', + 'account_sale_tax_id': sales_tax_xmlid, + 'account_purchase_tax_id': 'uae_purchase_tax_5', }, } diff --git a/addons/l10n_ar/models/template_ar_ri.py b/addons/l10n_ar/models/template_ar_ri.py index f7d500a58cc..9c97963d54f 100644 --- a/addons/l10n_ar/models/template_ar_ri.py +++ b/addons/l10n_ar/models/template_ar_ri.py @@ -27,5 +27,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'base_deudores_por_ventas_pos', 'income_currency_exchange_account_id': 'base_diferencias_de_cambio', 'expense_currency_exchange_account_id': 'base_diferencias_de_cambio', + 'account_sale_tax_id': 'ri_tax_vat_21_ventas', + 'account_purchase_tax_id': 'ri_tax_vat_21_compras', }, } diff --git a/addons/l10n_at/models/template_at.py b/addons/l10n_at/models/template_at.py index 7e8a47d3f52..c3310071258 100644 --- a/addons/l10n_at/models/template_at.py +++ b/addons/l10n_at/models/template_at.py @@ -37,5 +37,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'chart_at_template_8350', 'external_report_layout_id': 'l10n_din5008.external_layout_din5008', 'paperformat_id': 'l10n_din5008.paperformat_euro_din', + 'account_sale_tax_id': 'account_tax_template_sales_20_code022', + 'account_purchase_tax_id': 'account_tax_template_purchase_20_code060', }, } diff --git a/addons/l10n_au/models/template_au.py b/addons/l10n_au/models/template_au.py index f13e2a9bd29..11c74efc3e7 100644 --- a/addons/l10n_au/models/template_au.py +++ b/addons/l10n_au/models/template_au.py @@ -40,5 +40,7 @@ class AccountChartTemplate(models.AbstractModel): # Changing the opening date to the first day of the fiscal year. # This way the opening entries will be set to the 30th of June. 'account_opening_date': fields.Date.context_today(self).replace(month=7, day=1), + 'account_sale_tax_id': 'au_tax_sale_10', + 'account_purchase_tax_id': 'au_tax_purchase_10_service', }, } diff --git a/addons/l10n_be/models/template_be.py b/addons/l10n_be/models/template_be.py index 37bd6f1a6c7..59f485fb19b 100644 --- a/addons/l10n_be/models/template_be.py +++ b/addons/l10n_be/models/template_be.py @@ -30,6 +30,8 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_suspense_account_id': 'a499', 'account_journal_early_pay_discount_loss_account_id': 'a657000', 'account_journal_early_pay_discount_gain_account_id': 'a757000', + 'account_sale_tax_id': 'attn_VAT-OUT-21-L', + 'account_purchase_tax_id': 'attn_VAT-IN-V81-21', }, } diff --git a/addons/l10n_bg/models/template_bg.py b/addons/l10n_bg/models/template_bg.py index 44dd1b7d0c8..fe845516f6a 100644 --- a/addons/l10n_bg/models/template_bg.py +++ b/addons/l10n_bg/models/template_bg.py @@ -28,5 +28,7 @@ class AccountChartTemplate(models.AbstractModel): 'transfer_account_code_prefix': '430', 'income_currency_exchange_account_id': 'l10n_bg_624', 'expense_currency_exchange_account_id': 'l10n_bg_624', + 'account_sale_tax_id': 'l10n_bg_sale_vat_20', + 'account_purchase_tax_id': 'l10n_bg_purchase_vat_20_ptc', }, } diff --git a/addons/l10n_bo/models/template_bo.py b/addons/l10n_bo/models/template_bo.py index 98bbc0bd0b0..fc78c995264 100644 --- a/addons/l10n_bo/models/template_bo.py +++ b/addons/l10n_bo/models/template_bo.py @@ -37,5 +37,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'l10n_bo_4102', 'default_cash_difference_income_account_id': 'l10n_bo_4301', 'default_cash_difference_expense_account_id': 'l10n_bo_5601', + 'account_sale_tax_id': 'l10n_bo_iva_13_sale', + 'account_purchase_tax_id': 'l10n_bo_iva_13_purchase', }, } diff --git a/addons/l10n_br/models/template_br.py b/addons/l10n_br/models/template_br.py index 82a03424dc5..e5ca5545139 100644 --- a/addons/l10n_br/models/template_br.py +++ b/addons/l10n_br/models/template_br.py @@ -31,5 +31,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'br_3_11_01_09_01_40', 'account_journal_early_pay_discount_loss_account_id': 'account_template_31101010202', 'account_journal_early_pay_discount_gain_account_id': 'account_template_30101050148', + 'account_sale_tax_id': 'tax_template_out_icms_interno17', + 'account_purchase_tax_id': 'tax_template_in_icms_interno17', }, } diff --git a/addons/l10n_ca/models/template_ca.py b/addons/l10n_ca/models/template_ca.py index 0a94557d66a..ca4aa1bf89c 100644 --- a/addons/l10n_ca/models/template_ca.py +++ b/addons/l10n_ca/models/template_ca.py @@ -21,28 +21,21 @@ class AccountChartTemplate(models.AbstractModel): @template('ca_2023', 'res.company') def _get_ca_res_company(self): - company = self.env.company - def get_default_taxes(): - """ Finds the correct default sale and purchase tax according to the company province """ - if company.state_id.code == 'BC': - return 'gstpst_sale_tax_12_bc', 'gstpst_purchase_tax_12_bc' - elif company.state_id.code == 'MB': - return 'gstpst_sale_tax_12_mb', 'gstpst_purchase_tax_12_mb' - elif company.state_id.code in {'NB', 'NL', 'NS', 'PE'}: - return 'hst_sale_tax_15', 'hst_purchase_tax_15' - elif company.state_id.code == 'ON': - return 'hst_sale_tax_13', 'hst_purchase_tax_13' - elif company.state_id.code == 'SK': - return 'gstpst_sale_tax_11', 'gstpst_purchase_tax_11' - elif company.state_id.code == 'QC': - return 'gstqst_sale_tax_14975', 'gstqst_purchase_tax_14975' - else: - return 'gst_sale_tax_5', 'gst_purchase_tax_5' + default_sales_tax, default_purchase_tax = { + 'BC': ('gstpst_sale_tax_12_bc', 'gstpst_purchase_tax_12_bc'), + 'MB': ('gstpst_sale_tax_12_mb', 'gstpst_purchase_tax_12_mb'), + 'QC': ('gstqst_sale_tax_14975', 'gstqst_purchase_tax_14975'), + 'SK': ('gstpst_sale_tax_11', 'gstpst_purchase_tax_11'), + 'ON': ('hst_sale_tax_13', 'hst_purchase_tax_13'), + 'NB': ('hst_sale_tax_15', 'hst_purchase_tax_15'), + 'NL': ('hst_sale_tax_15', 'hst_purchase_tax_15'), + 'NS': ('hst_sale_tax_15', 'hst_purchase_tax_15'), + 'PE': ('hst_sale_tax_15', 'hst_purchase_tax_15'), + }.get(self.env.company.state_id.code, ('gst_sale_tax_5', 'gst_purchase_tax_5')) - default_sales_tax, default_purchase_tax = get_default_taxes() return { - company.id: { + self.env.company.id: { 'account_fiscal_country_id': 'base.ca', 'bank_account_code_prefix': '11131', 'cash_account_code_prefix': '11121', diff --git a/addons/l10n_ch/models/template_ch.py b/addons/l10n_ch/models/template_ch.py index 647b2d70a1a..b162e43f94d 100644 --- a/addons/l10n_ch/models/template_ch.py +++ b/addons/l10n_ch/models/template_ch.py @@ -35,5 +35,7 @@ class AccountChartTemplate(models.AbstractModel): 'default_cash_difference_income_account_id': 'ch_coa_4992', 'external_report_layout_id': 'l10n_din5008.external_layout_din5008', 'paperformat_id': 'l10n_din5008.paperformat_euro_din', + 'account_sale_tax_id': 'vat_77', + 'account_purchase_tax_id': 'vat_77_purchase', }, } diff --git a/addons/l10n_cl/models/template_cl.py b/addons/l10n_cl/models/template_cl.py index d8aa14ed965..fcb57d14bd3 100644 --- a/addons/l10n_cl/models/template_cl.py +++ b/addons/l10n_cl/models/template_cl.py @@ -34,5 +34,7 @@ class AccountChartTemplate(models.AbstractModel): 'income_currency_exchange_account_id': 'account_410195', 'expense_currency_exchange_account_id': 'account_410195', 'tax_calculation_rounding_method': 'round_globally', + 'account_sale_tax_id': 'ITAX_19', + 'account_purchase_tax_id': 'OTAX_19', }, } diff --git a/addons/l10n_cn/models/template_cn.py b/addons/l10n_cn/models/template_cn.py index 527b759650e..0b603ebf118 100644 --- a/addons/l10n_cn/models/template_cn.py +++ b/addons/l10n_cn/models/template_cn.py @@ -28,5 +28,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'l10n_cn_1124', 'income_currency_exchange_account_id': 'l10n_cn_6051', 'expense_currency_exchange_account_id': 'l10n_cn_6711', + 'account_sale_tax_id': 'l10n_cn_sales_included_13', + 'account_purchase_tax_id': 'l10n_cn_purchase_excluded_13', }, } diff --git a/addons/l10n_co/models/template_co.py b/addons/l10n_co/models/template_co.py index 364479461a8..d0955fb96f7 100644 --- a/addons/l10n_co/models/template_co.py +++ b/addons/l10n_co/models/template_co.py @@ -28,5 +28,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'co_puc_530505', 'account_journal_early_pay_discount_loss_account_id': 'co_puc_530535', 'account_journal_early_pay_discount_gain_account_id': 'co_puc_421040', + 'account_sale_tax_id': 'l10n_co_tax_8', + 'account_purchase_tax_id': 'l10n_co_tax_1', }, } diff --git a/addons/l10n_cr/models/template_cr.py b/addons/l10n_cr/models/template_cr.py index e124624f651..d09315d0071 100644 --- a/addons/l10n_cr/models/template_cr.py +++ b/addons/l10n_cr/models/template_cr.py @@ -26,5 +26,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'account_account_template_0_112011', 'income_currency_exchange_account_id': 'account_account_template_0_450001', 'expense_currency_exchange_account_id': 'account_account_template_0_530004', + 'account_sale_tax_id': 'account_tax_template_IV_0', + 'account_purchase_tax_id': 'account_tax_template_IV_1', }, } diff --git a/addons/l10n_cz/models/template_cz.py b/addons/l10n_cz/models/template_cz.py index c9ed6a98be5..403d508aa0c 100644 --- a/addons/l10n_cz/models/template_cz.py +++ b/addons/l10n_cz/models/template_cz.py @@ -36,5 +36,7 @@ class AccountChartTemplate(models.AbstractModel): 'default_cash_difference_income_account_id': 'chart_cz_668000', 'default_cash_difference_expense_account_id': 'chart_cz_568000', 'account_default_pos_receivable_account_id': 'chart_cz_311001', + 'account_sale_tax_id': 'vyc_tuz_21', + 'account_purchase_tax_id': 'vsc_tuz_21', }, } diff --git a/addons/l10n_de/models/template_de_skr03.py b/addons/l10n_de/models/template_de_skr03.py index 26653978977..c252cfcc5b5 100644 --- a/addons/l10n_de/models/template_de_skr03.py +++ b/addons/l10n_de/models/template_de_skr03.py @@ -33,6 +33,8 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'account_2150', 'account_journal_early_pay_discount_loss_account_id': 'account_2130', 'account_journal_early_pay_discount_gain_account_id': 'account_2670', + 'account_sale_tax_id': 'tax_ust_19_skr03', + 'account_purchase_tax_id': 'tax_vst_19_skr03', }, } diff --git a/addons/l10n_de/models/template_de_skr04.py b/addons/l10n_de/models/template_de_skr04.py index 5a64a229e10..bde463e372c 100644 --- a/addons/l10n_de/models/template_de_skr04.py +++ b/addons/l10n_de/models/template_de_skr04.py @@ -32,6 +32,8 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'chart_skr04_5730', 'default_cash_difference_income_account_id': 'chart_skr04_9991', 'default_cash_difference_expense_account_id': 'chart_skr04_9994', + 'account_sale_tax_id': 'tax_ust_19_skr04', + 'account_purchase_tax_id': 'tax_vst_19_skr04', }, } diff --git a/addons/l10n_dk/models/template_dk.py b/addons/l10n_dk/models/template_dk.py index 57157637836..451700a810c 100644 --- a/addons/l10n_dk/models/template_dk.py +++ b/addons/l10n_dk/models/template_dk.py @@ -34,5 +34,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'dk_coa_3610', 'account_journal_early_pay_discount_loss_account_id': 'dk_coa_3790', 'account_journal_early_pay_discount_gain_account_id': 'dk_coa_3570', + 'account_sale_tax_id': 'tax110', + 'account_purchase_tax_id': 'tax400', }, } diff --git a/addons/l10n_do/models/template_do.py b/addons/l10n_do/models/template_do.py index 581cd2f471d..5e84c4f42cb 100644 --- a/addons/l10n_do/models/template_do.py +++ b/addons/l10n_do/models/template_do.py @@ -35,5 +35,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'l10n_do_42040400', 'default_cash_difference_income_account_id': 'l10n_do_42040400', 'default_cash_difference_expense_account_id': 'l10n_do_61081000', + 'account_sale_tax_id': 'tax_18_sale', + 'account_purchase_tax_id': 'tax_18_purch', }, } diff --git a/addons/l10n_dz/models/template_dz.py b/addons/l10n_dz/models/template_dz.py index e868693fdc0..19c2fd24b50 100644 --- a/addons/l10n_dz/models/template_dz.py +++ b/addons/l10n_dz/models/template_dz.py @@ -32,5 +32,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'l10n_dz_609', 'default_cash_difference_income_account_id': 'l10n_dz_758', 'default_cash_difference_expense_account_id': 'l10n_dz_657', + 'account_sale_tax_id': 'l10n_dz_vat_sale_19_prod', + 'account_purchase_tax_id': 'l10n_dz_vat_purchase_19', }, } diff --git a/addons/l10n_ec/models/template_ec.py b/addons/l10n_ec/models/template_ec.py index 0a521e729d3..4f20251fb6a 100644 --- a/addons/l10n_ec/models/template_ec.py +++ b/addons/l10n_ec/models/template_ec.py @@ -35,6 +35,8 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'ec_early_pay_discount_gain', 'default_cash_difference_income_account_id': 'ec_income_cash_difference', 'default_cash_difference_expense_account_id': 'ec_expense_cash_difference', + 'account_sale_tax_id': 'tax_vat_411_goods', + 'account_purchase_tax_id': 'tax_vat_510_sup_01', }, } diff --git a/addons/l10n_ee/models/template_ee.py b/addons/l10n_ee/models/template_ee.py index 89793853a6d..44ac4837fbc 100644 --- a/addons/l10n_ee/models/template_ee.py +++ b/addons/l10n_ee/models/template_ee.py @@ -32,5 +32,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'l10n_ee_430', 'default_cash_difference_income_account_id': 'l10n_ee_420', 'default_cash_difference_expense_account_id': 'l10n_ee_671', + 'account_sale_tax_id': 'l10n_ee_vat_out_20_g', + 'account_purchase_tax_id': 'l10n_ee_vat_in_20_g', }, } diff --git a/addons/l10n_eg/models/template_eg.py b/addons/l10n_eg/models/template_eg.py index 910d500b1c8..c28d87c7e1e 100644 --- a/addons/l10n_eg/models/template_eg.py +++ b/addons/l10n_eg/models/template_eg.py @@ -36,6 +36,8 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_payment_credit_account_id': 'egy_account_105003', 'default_cash_difference_income_account_id': 'egy_account_999002', 'default_cash_difference_expense_account_id': 'egy_account_999001', + 'account_sale_tax_id': 'eg_standard_sale_14', + 'account_purchase_tax_id': 'eg_standard_purchase_14', }, } diff --git a/addons/l10n_es/models/template_es_assec.py b/addons/l10n_es/models/template_es_assec.py index 0f2a7c559cd..0551cfc2923 100644 --- a/addons/l10n_es/models/template_es_assec.py +++ b/addons/l10n_es/models/template_es_assec.py @@ -21,5 +21,7 @@ class AccountChartTemplate(models.AbstractModel): 'bank_account_code_prefix': '572', 'cash_account_code_prefix': '570', 'transfer_account_code_prefix': '57299', + 'account_sale_tax_id': 'account_tax_template_s_iva21b', + 'account_purchase_tax_id': 'account_tax_template_p_iva21_bc', }, } diff --git a/addons/l10n_es/models/template_es_common.py b/addons/l10n_es/models/template_es_common.py index 2197bbbd592..97397db30af 100644 --- a/addons/l10n_es/models/template_es_common.py +++ b/addons/l10n_es/models/template_es_common.py @@ -37,5 +37,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_payment_credit_account_id': 'account_common_411', 'default_cash_difference_income_account_id': 'account_common_778', 'default_cash_difference_expense_account_id': 'account_common_678', + 'account_sale_tax_id': 'account_tax_template_s_iva21b', + 'account_purchase_tax_id': 'account_tax_template_p_iva21_bc', }, } diff --git a/addons/l10n_es/models/template_es_full.py b/addons/l10n_es/models/template_es_full.py index 1578f3cf922..4070abf90b9 100644 --- a/addons/l10n_es/models/template_es_full.py +++ b/addons/l10n_es/models/template_es_full.py @@ -21,5 +21,7 @@ class AccountChartTemplate(models.AbstractModel): 'bank_account_code_prefix': '572', 'cash_account_code_prefix': '570', 'transfer_account_code_prefix': '57299', + 'account_sale_tax_id': 'account_tax_template_s_iva21b', + 'account_purchase_tax_id': 'account_tax_template_p_iva21_bc', }, } diff --git a/addons/l10n_es/models/template_es_pymes.py b/addons/l10n_es/models/template_es_pymes.py index 8850e0af373..f25091f26d4 100644 --- a/addons/l10n_es/models/template_es_pymes.py +++ b/addons/l10n_es/models/template_es_pymes.py @@ -22,5 +22,7 @@ class AccountChartTemplate(models.AbstractModel): 'bank_account_code_prefix': '572', 'cash_account_code_prefix': '570', 'transfer_account_code_prefix': '57299', + 'account_sale_tax_id': 'account_tax_template_s_iva21b', + 'account_purchase_tax_id': 'account_tax_template_p_iva21_bc', }, } diff --git a/addons/l10n_et/models/template_et.py b/addons/l10n_et/models/template_et.py index 73256d52725..2411393522a 100644 --- a/addons/l10n_et/models/template_et.py +++ b/addons/l10n_et/models/template_et.py @@ -29,5 +29,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'l10n_et6436', 'account_journal_early_pay_discount_loss_account_id': 'l10n_et626001', 'account_journal_early_pay_discount_gain_account_id': 'l10n_et120001', + 'account_sale_tax_id': 'id_tax03', + 'account_purchase_tax_id': 'id_tax08', }, } diff --git a/addons/l10n_fi/models/template_fi.py b/addons/l10n_fi/models/template_fi.py index d02516a0875..7637d4ce335 100644 --- a/addons/l10n_fi/models/template_fi.py +++ b/addons/l10n_fi/models/template_fi.py @@ -31,5 +31,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'account_4380', 'account_journal_early_pay_discount_loss_account_id': 'account_4230', 'account_journal_early_pay_discount_gain_account_id': 'account_3500', + 'account_sale_tax_id': 'tax_dom_sales_goods_24', + 'account_purchase_tax_id': 'tax_dom_purchase_goods_24', }, } diff --git a/addons/l10n_fr/models/template_fr.py b/addons/l10n_fr/models/template_fr.py index 102f0f4a5e3..78031a4df8e 100644 --- a/addons/l10n_fr/models/template_fr.py +++ b/addons/l10n_fr/models/template_fr.py @@ -31,6 +31,8 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'pcg_765', 'l10n_fr_rounding_difference_loss_account_id': 'pcg_658', 'l10n_fr_rounding_difference_profit_account_id': 'pcg_758', + 'account_sale_tax_id': 'tva_normale', + 'account_purchase_tax_id': 'tva_acq_normale', }, } diff --git a/addons/l10n_gr/models/template_gr.py b/addons/l10n_gr/models/template_gr.py index 8673d6b3775..f3a197264df 100644 --- a/addons/l10n_gr/models/template_gr.py +++ b/addons/l10n_gr/models/template_gr.py @@ -31,5 +31,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'l10n_gr_70_01_03', 'default_cash_difference_income_account_id': 'l10n_gr_71_06', 'default_cash_difference_expense_account_id': 'l10n_gr_64_14', + 'account_sale_tax_id': 'l10n_gr_tax_s24_G', + 'account_purchase_tax_id': 'l10n_gr_tax_p24_G', }, } diff --git a/addons/l10n_gt/models/template_gt.py b/addons/l10n_gt/models/template_gt.py index f90eac326a8..e3eec73f0b8 100644 --- a/addons/l10n_gt/models/template_gt.py +++ b/addons/l10n_gt/models/template_gt.py @@ -27,5 +27,8 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'cta110205', 'income_currency_exchange_account_id': 'cta410103', 'expense_currency_exchange_account_id': 'cta710101', + 'account_sale_tax_id': 'impuestos_plantilla_iva_por_pagar', + 'account_purchase_tax_id': 'impuestos_plantilla_iva_por_cobrar', + }, } diff --git a/addons/l10n_hn/models/template_hn.py b/addons/l10n_hn/models/template_hn.py index 239b0cf71ee..e96ad9c9224 100644 --- a/addons/l10n_hn/models/template_hn.py +++ b/addons/l10n_hn/models/template_hn.py @@ -29,5 +29,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'cta710101', 'account_journal_early_pay_discount_loss_account_id': 'cta620202', 'account_journal_early_pay_discount_gain_account_id': 'cta420102', + 'account_sale_tax_id': 'impuestos_plantilla_isv_por_pagar', + 'account_purchase_tax_id': 'impuestos_plantilla_isv_por_cobrar', }, } diff --git a/addons/l10n_hr/models/template_hr.py b/addons/l10n_hr/models/template_hr.py index 30c5cdc7b00..e0e855190c9 100644 --- a/addons/l10n_hr/models/template_hr.py +++ b/addons/l10n_hr/models/template_hr.py @@ -28,5 +28,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'hr_120100', 'income_currency_exchange_account_id': 'hr_772000', 'expense_currency_exchange_account_id': 'hr_475000', + 'account_sale_tax_id': 'VAT_S_IN_ROC_25', + 'account_purchase_tax_id': 'VAT_P_IN_ROC_25', }, } diff --git a/addons/l10n_hu/models/template_hu.py b/addons/l10n_hu/models/template_hu.py index 010275f301c..52bb3211d7b 100644 --- a/addons/l10n_hu/models/template_hu.py +++ b/addons/l10n_hu/models/template_hu.py @@ -29,5 +29,7 @@ class AccountChartTemplate(models.AbstractModel): 'transfer_account_code_prefix': '389', 'income_currency_exchange_account_id': 'l10n_hu_976', 'expense_currency_exchange_account_id': 'l10n_hu_876', + 'account_sale_tax_id': 'F27', + 'account_purchase_tax_id': 'V27', }, } diff --git a/addons/l10n_id/models/template_id.py b/addons/l10n_id/models/template_id.py index 4fde3f94fba..bfdbaae4633 100644 --- a/addons/l10n_id/models/template_id.py +++ b/addons/l10n_id/models/template_id.py @@ -33,5 +33,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'l10n_id_91100010', 'account_journal_early_pay_discount_loss_account_id': 'l10n_id_99900003', 'account_journal_early_pay_discount_gain_account_id': 'l10n_id_99900004', + 'account_sale_tax_id': 'tax_ST1', + 'account_purchase_tax_id': 'tax_PT1', }, } diff --git a/addons/l10n_ie/models/template_ie.py b/addons/l10n_ie/models/template_ie.py index a7cd94b33fb..a5b24b7a4a5 100644 --- a/addons/l10n_ie/models/template_ie.py +++ b/addons/l10n_ie/models/template_ie.py @@ -36,5 +36,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'l10n_ie_account_730', 'default_cash_difference_expense_account_id': 'l10n_ie_account_641', 'default_cash_difference_income_account_id': 'l10n_ie_account_731', + 'account_sale_tax_id': 'ie_tax_sale_goods_23', + 'account_purchase_tax_id': 'ie_tax_purchase_goods_23', }, } diff --git a/addons/l10n_il/models/template_il.py b/addons/l10n_il/models/template_il.py index 1c83aba8d46..406225a37c1 100644 --- a/addons/l10n_il/models/template_il.py +++ b/addons/l10n_il/models/template_il.py @@ -30,5 +30,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'il_account_101201', 'income_currency_exchange_account_id': 'il_account_201000', 'expense_currency_exchange_account_id': 'il_account_202100', + 'account_sale_tax_id': 'il_vat_sales_17', + 'account_purchase_tax_id': 'il_vat_self_inv_purchase', }, } diff --git a/addons/l10n_in/models/template_in.py b/addons/l10n_in/models/template_in.py index e341f3f88a7..d40a63db7dd 100644 --- a/addons/l10n_in/models/template_in.py +++ b/addons/l10n_in/models/template_in.py @@ -34,5 +34,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': '2012', 'account_opening_date': fields.Date.context_today(self).replace(month=4, day=1), 'fiscalyear_last_month': '3', + 'account_sale_tax_id': 'igst_sale_18', + 'account_purchase_tax_id': 'igst_purchase_18', }, } diff --git a/addons/l10n_in_edi/tests/test_edi_json.py b/addons/l10n_in_edi/tests/test_edi_json.py index c4f704f5a15..9ce6cbbafeb 100644 --- a/addons/l10n_in_edi/tests/test_edi_json.py +++ b/addons/l10n_in_edi/tests/test_edi_json.py @@ -1,5 +1,6 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo.addons.account.tests.common import AccountTestInvoicingCommon +from odoo.fields import Command from odoo.tests import tagged @@ -31,7 +32,13 @@ class TestEdiJson(AccountTestInvoicingCommon): "country_id": cls.env.ref("base.in").id, "l10n_in_gst_treatment": "regular", }) - cls.product_a.write({"l10n_in_hsn_code": "01111"}) + sgst_sale_5 = cls.env["account.chart.template"].ref("sgst_sale_5") + sgst_purchase_5 = cls.env["account.chart.template"].ref("sgst_purchase_5") + cls.product_a.write({ + "l10n_in_hsn_code": "01111", + 'taxes_id': sgst_sale_5, + 'supplier_taxes_id': sgst_purchase_5, + }) cls.product_a2 = cls.env['product.product'].create({ 'name': 'product_a2', 'uom_id': cls.env.ref('uom.product_uom_unit').id, @@ -39,8 +46,8 @@ class TestEdiJson(AccountTestInvoicingCommon): 'standard_price': 1000.0, 'property_account_income_id': cls.company_data['default_account_revenue'].id, 'property_account_expense_id': cls.company_data['default_account_expense'].id, - 'taxes_id': [(6, 0, cls.tax_sale_a.ids)], - 'supplier_taxes_id': [(6, 0, cls.tax_purchase_a.ids)], + 'taxes_id': [Command.set(sgst_sale_5.ids)], + 'supplier_taxes_id': [Command.set(sgst_purchase_5.ids)], "l10n_in_hsn_code": "01111", }) cls.product_a_discount = cls.env['product.product'].create({ @@ -50,8 +57,8 @@ class TestEdiJson(AccountTestInvoicingCommon): 'standard_price': 400.0, 'property_account_income_id': cls.company_data['default_account_revenue'].id, 'property_account_expense_id': cls.company_data['default_account_expense'].id, - 'taxes_id': [(6, 0, cls.tax_sale_a.ids)], - 'supplier_taxes_id': [(6, 0, cls.tax_purchase_a.ids)], + 'taxes_id': [Command.set(sgst_sale_5.ids)], + 'supplier_taxes_id': [Command.set(sgst_purchase_5.ids)], "l10n_in_hsn_code": "01111", }) gst_with_cess = cls.env.ref("account.%s_sgst_sale_12" % (cls.company_data["company"].id) @@ -63,8 +70,8 @@ class TestEdiJson(AccountTestInvoicingCommon): "standard_price": 800.0, "property_account_income_id": cls.company_data["default_account_revenue"].id, "property_account_expense_id": cls.company_data["default_account_expense"].id, - "taxes_id": [(6, 0, gst_with_cess.ids)], - "supplier_taxes_id": [(6, 0, cls.tax_purchase_a.ids)], + "taxes_id": [Command.set(gst_with_cess.ids)], + "supplier_taxes_id": [Command.set(sgst_purchase_5.ids)], "l10n_in_hsn_code": "02222", }) rounding = cls.env["account.cash.rounding"].create({ diff --git a/addons/l10n_it/models/template_it.py b/addons/l10n_it/models/template_it.py index 58d540866e4..21ccb300a12 100644 --- a/addons/l10n_it/models/template_it.py +++ b/addons/l10n_it/models/template_it.py @@ -29,5 +29,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_loss_account_id': '4111', 'account_journal_early_pay_discount_gain_account_id': '3111', 'tax_calculation_rounding_method': 'round_globally', + 'account_sale_tax_id': '22v', + 'account_purchase_tax_id': '22am', }, } diff --git a/addons/l10n_it_edi/models/__init__.py b/addons/l10n_it_edi/models/__init__.py index 6804a7790d9..2c9e2520083 100644 --- a/addons/l10n_it_edi/models/__init__.py +++ b/addons/l10n_it_edi/models/__init__.py @@ -4,7 +4,6 @@ from . import res_partner from . import res_company from . import res_config_settings -from . import account_chart_template from . import account_invoice from . import account_edi_document from . import account_edi_format diff --git a/addons/l10n_it_edi/models/account_chart_template.py b/addons/l10n_it_edi/models/account_chart_template.py deleted file mode 100644 index 8b688b17b09..00000000000 --- a/addons/l10n_it_edi/models/account_chart_template.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import models - - -class AccountChartTemplate(models.AbstractModel): - _inherit = 'account.chart.template' - - def _post_load_data(self, template_code, company, template_data): - """ - Override normal default taxes, which are the ones with lowest sequence. - """ - result = super()._post_load_data(template_code, company, template_data) - if template_code == 'it': - company.account_sale_tax_id = self.ref('22v') - company.account_purchase_tax_id = self.ref('22am') - return result diff --git a/addons/l10n_jp/models/template_jp.py b/addons/l10n_jp/models/template_jp.py index af665b55ab5..188513461b3 100644 --- a/addons/l10n_jp/models/template_jp.py +++ b/addons/l10n_jp/models/template_jp.py @@ -40,5 +40,7 @@ class AccountChartTemplate(models.AbstractModel): 'default_cash_difference_income_account_id': 'l10n_jp_999002', 'account_journal_early_pay_discount_loss_account_id': 'l10n_jp_510200', 'account_journal_early_pay_discount_gain_account_id': 'l10n_jp_425000', + 'account_sale_tax_id': 'l10n_jp_tax_sale_exc_10', + 'account_purchase_tax_id': 'l10n_jp_tax_purchase_exc_10', }, } diff --git a/addons/l10n_ke/models/template_ke.py b/addons/l10n_ke/models/template_ke.py index ce9f93a77ba..0e503823819 100644 --- a/addons/l10n_ke/models/template_ke.py +++ b/addons/l10n_ke/models/template_ke.py @@ -35,5 +35,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'ke400710', 'default_cash_difference_income_account_id': 'ke5146', 'default_cash_difference_expense_account_id': 'ke5146', + 'account_sale_tax_id': 'ST16', + 'account_purchase_tax_id': 'PT16', }, } diff --git a/addons/l10n_kz/models/template_kz.py b/addons/l10n_kz/models/template_kz.py index 0ebc3d132f2..d7d0f776233 100644 --- a/addons/l10n_kz/models/template_kz.py +++ b/addons/l10n_kz/models/template_kz.py @@ -30,6 +30,8 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'kz6291', 'default_cash_difference_income_account_id': 'kz6210', 'default_cash_difference_expense_account_id': 'kz7410', + 'account_sale_tax_id': 'l10n_kz_tax_vat_12_sale', + 'account_purchase_tax_id': 'l10n_kz_tax_vat_12_purchase', }, } diff --git a/addons/l10n_lt/models/template_lt.py b/addons/l10n_lt/models/template_lt.py index 95fc152ad7b..294a21a110d 100644 --- a/addons/l10n_lt/models/template_lt.py +++ b/addons/l10n_lt/models/template_lt.py @@ -33,5 +33,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'account_account_template_6803', 'account_journal_early_pay_discount_loss_account_id': 'account_account_template_509', 'account_journal_early_pay_discount_gain_account_id': 'account_account_template_6209', + 'account_sale_tax_id': 'account_tax_template_sales_21', + 'account_purchase_tax_id': 'account_tax_template_purchase_21', }, } diff --git a/addons/l10n_lu/models/template_lu.py b/addons/l10n_lu/models/template_lu.py index 2efc7590757..08ea53031cc 100644 --- a/addons/l10n_lu/models/template_lu.py +++ b/addons/l10n_lu/models/template_lu.py @@ -33,6 +33,8 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_suspense_account_id': 'lu_2011_account_485', 'account_journal_early_pay_discount_loss_account_id': 'lu_2020_account_65562', 'account_journal_early_pay_discount_gain_account_id': 'lu_2020_account_75562', + 'account_sale_tax_id': 'lu_2015_tax_VP-PA-17', + 'account_purchase_tax_id': 'lu_2015_tax_AP-PA-17', }, } diff --git a/addons/l10n_lv/models/template_lv.py b/addons/l10n_lv/models/template_lv.py index 4c0d1b31a46..cd04895ee5b 100644 --- a/addons/l10n_lv/models/template_lv.py +++ b/addons/l10n_lv/models/template_lv.py @@ -35,5 +35,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_payment_credit_account_id': 'a26293', 'default_cash_difference_income_account_id': 'a8199', 'default_cash_difference_expense_account_id': 'a8299', + 'account_sale_tax_id': 'tax_sale_vat_21', + 'account_purchase_tax_id': 'tax_purchase_vat_21', }, } diff --git a/addons/l10n_ma/models/template_ma.py b/addons/l10n_ma/models/template_ma.py index 6749718d610..f783e00ee9f 100644 --- a/addons/l10n_ma/models/template_ma.py +++ b/addons/l10n_ma/models/template_ma.py @@ -33,5 +33,7 @@ class AccountChartTemplate(models.AbstractModel): 'default_cash_difference_expense_account_id': 'pcg_63861', 'account_journal_early_pay_discount_gain_account_id': 'pcg_73862', 'account_journal_early_pay_discount_loss_account_id': 'pcg_63862', + 'account_sale_tax_id': 'vat_out_20_80', + 'account_purchase_tax_id': 'vat_in_20_146', }, } diff --git a/addons/l10n_mn/models/template_mn.py b/addons/l10n_mn/models/template_mn.py index a79ea957c1c..c494a01e445 100644 --- a/addons/l10n_mn/models/template_mn.py +++ b/addons/l10n_mn/models/template_mn.py @@ -35,5 +35,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'account_template_5302_0201', 'account_journal_early_pay_discount_loss_account_id': 'account_template_9990_0003', 'account_journal_early_pay_discount_gain_account_id': 'account_template_9990_0004', + 'account_sale_tax_id': 'account_tax_sale_vat1', + 'account_purchase_tax_id': 'account_tax_purchase_vat1', }, } diff --git a/addons/l10n_mx/models/template_mx.py b/addons/l10n_mx/models/template_mx.py index b7d23a2ceb3..4a8be08d003 100644 --- a/addons/l10n_mx/models/template_mx.py +++ b/addons/l10n_mx/models/template_mx.py @@ -36,6 +36,8 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_loss_account_id': 'cuenta9993', 'account_journal_early_pay_discount_gain_account_id': 'cuenta9994', 'tax_cash_basis_journal_id': 'cbmx', + 'account_sale_tax_id': 'tax12', + 'account_purchase_tax_id': 'tax14', }, } diff --git a/addons/l10n_my/models/template_my.py b/addons/l10n_my/models/template_my.py index 49a9a1bc43f..baed846d0aa 100644 --- a/addons/l10n_my/models/template_my.py +++ b/addons/l10n_my/models/template_my.py @@ -28,5 +28,6 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'l10n_my_1243', 'income_currency_exchange_account_id': 'l10n_my_4240', 'expense_currency_exchange_account_id': 'l10n_my_5240', + 'account_sale_tax_id': 'l10n_my_tax_sale_10', }, } diff --git a/addons/l10n_mz/models/template_mz.py b/addons/l10n_mz/models/template_mz.py index e7339d81187..00645231c8b 100644 --- a/addons/l10n_mz/models/template_mz.py +++ b/addons/l10n_mz/models/template_mz.py @@ -29,5 +29,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'l10n_mz_account_6941', 'account_journal_early_pay_discount_loss_account_id': 'l10n_mz_account_695', 'account_journal_early_pay_discount_gain_account_id': 'l10n_mz_account_785', + 'account_sale_tax_id': 'vat_sale_16', + 'account_purchase_tax_id': 'vat_purch_16_inventories', }, } diff --git a/addons/l10n_nl/models/template_nl.py b/addons/l10n_nl/models/template_nl.py index 9a6c59322dd..1959bc871f9 100644 --- a/addons/l10n_nl/models/template_nl.py +++ b/addons/l10n_nl/models/template_nl.py @@ -35,5 +35,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': '4920', 'account_journal_early_pay_discount_loss_account_id': '7065', 'account_journal_early_pay_discount_gain_account_id': '8065', + 'account_sale_tax_id': 'btw_21', + 'account_purchase_tax_id': 'btw_21_buy', }, } diff --git a/addons/l10n_no/models/template_no.py b/addons/l10n_no/models/template_no.py index 7d452d8678e..96cb40a6ddd 100644 --- a/addons/l10n_no/models/template_no.py +++ b/addons/l10n_no/models/template_no.py @@ -33,5 +33,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'chart8160', 'account_journal_early_pay_discount_loss_account_id': 'chart4370', 'account_journal_early_pay_discount_gain_account_id': 'chart3080', + 'account_sale_tax_id': 'tax3', + 'account_purchase_tax_id': 'tax2', }, } diff --git a/addons/l10n_nz/models/template_nz.py b/addons/l10n_nz/models/template_nz.py index e8a4f5fa00c..19a01fbb7ae 100644 --- a/addons/l10n_nz/models/template_nz.py +++ b/addons/l10n_nz/models/template_nz.py @@ -33,5 +33,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'nz_61630', 'account_journal_early_pay_discount_loss_account_id': 'nz_61610', 'account_journal_early_pay_discount_gain_account_id': 'nz_61620', + 'account_sale_tax_id': 'nz_tax_sale_15', + 'account_purchase_tax_id': 'nz_tax_purchase_15', }, } diff --git a/addons/l10n_pa/models/template_pa.py b/addons/l10n_pa/models/template_pa.py index 2ade9f89c2d..e172270d3e0 100644 --- a/addons/l10n_pa/models/template_pa.py +++ b/addons/l10n_pa/models/template_pa.py @@ -27,5 +27,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': '121_01', 'income_currency_exchange_account_id': 'gain81_01', 'expense_currency_exchange_account_id': 'loss81_01', + 'account_sale_tax_id': 'ITAX_19', + 'account_purchase_tax_id': 'OTAX_19', }, } diff --git a/addons/l10n_pe/models/template_pe.py b/addons/l10n_pe/models/template_pe.py index c250b46a81c..36c51b421e4 100644 --- a/addons/l10n_pe/models/template_pe.py +++ b/addons/l10n_pe/models/template_pe.py @@ -33,5 +33,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'chart676', 'account_journal_early_pay_discount_loss_account_id': 'chart675', 'account_journal_early_pay_discount_gain_account_id': 'chart775', + 'account_sale_tax_id': 'sale_tax_igv_18', + 'account_purchase_tax_id': 'purchase_tax_igv_18', }, } diff --git a/addons/l10n_ph/models/template_ph.py b/addons/l10n_ph/models/template_ph.py index 7597adec23c..15ee56f9d2b 100644 --- a/addons/l10n_ph/models/template_ph.py +++ b/addons/l10n_ph/models/template_ph.py @@ -33,5 +33,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_suspense_account_id': 'l10n_ph_100000', 'default_cash_difference_income_account_id': 'l10n_ph_710102', 'default_cash_difference_expense_account_id': 'l10n_ph_710103', + 'account_sale_tax_id': 'l10n_ph_tax_sale_vat_12', + 'account_purchase_tax_id': 'l10n_ph_tax_purchase_vat_12', }, } diff --git a/addons/l10n_pk/models/template_pk.py b/addons/l10n_pk/models/template_pk.py index b11706b4fc6..645d52721bd 100644 --- a/addons/l10n_pk/models/template_pk.py +++ b/addons/l10n_pk/models/template_pk.py @@ -28,5 +28,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_suspense_account_id': 'l10n_pk_2226000', 'account_journal_early_pay_discount_loss_account_id': 'l10n_pk_4411003', 'account_journal_early_pay_discount_gain_account_id': 'l10n_pk_3112004', + 'account_sale_tax_id': 'pk_sales_tax_17', + 'account_purchase_tax_id': 'purchases_tax_17', }, } diff --git a/addons/l10n_pt/models/template_pt.py b/addons/l10n_pt/models/template_pt.py index 02133a96338..0db2abc8d4c 100644 --- a/addons/l10n_pt/models/template_pt.py +++ b/addons/l10n_pt/models/template_pt.py @@ -32,5 +32,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'chart_6863', 'account_journal_early_pay_discount_loss_account_id': 'chart_682', 'account_journal_early_pay_discount_gain_account_id': 'chart_728', + 'account_sale_tax_id': 'iva_pt_sale_normal', + 'account_purchase_tax_id': 'iva_pt_purchase_normal', }, } diff --git a/addons/l10n_ro/models/template_ro.py b/addons/l10n_ro/models/template_ro.py index 78d744ddfb9..5086d071f56 100644 --- a/addons/l10n_ro/models/template_ro.py +++ b/addons/l10n_ro/models/template_ro.py @@ -31,6 +31,8 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_suspense_account_id': 'pcg_5125', 'account_journal_early_pay_discount_loss_account_id': 'pcg_6092', 'account_journal_early_pay_discount_gain_account_id': 'pcg_709', + 'account_sale_tax_id': 'tvac_19', + 'account_purchase_tax_id': 'tvad_19', }, } diff --git a/addons/l10n_rs/models/template_rs.py b/addons/l10n_rs/models/template_rs.py index 4ad748bd851..089a4cdc9e4 100644 --- a/addons/l10n_rs/models/template_rs.py +++ b/addons/l10n_rs/models/template_rs.py @@ -30,5 +30,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'rs_563', 'default_cash_difference_income_account_id': 'rs_6791', 'default_cash_difference_expense_account_id': 'rs_5791', + 'account_sale_tax_id': 'rs_sale_vat_20', + 'account_purchase_tax_id': 'rs_purchase_vat_20', }, } diff --git a/addons/l10n_sa/models/template_sa.py b/addons/l10n_sa/models/template_sa.py index f0b9476cff8..2d9cdf3ed56 100644 --- a/addons/l10n_sa/models/template_sa.py +++ b/addons/l10n_sa/models/template_sa.py @@ -29,6 +29,8 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'sa_account_102012', 'income_currency_exchange_account_id': 'sa_account_400053', 'expense_currency_exchange_account_id': 'sa_account_500011', + 'account_sale_tax_id': 'sa_sales_tax_15', + 'account_purchase_tax_id': 'sa_purchase_tax_15', }, } diff --git a/addons/l10n_se/models/template_se.py b/addons/l10n_se/models/template_se.py index a939dfff1ba..0be3645595f 100644 --- a/addons/l10n_se/models/template_se.py +++ b/addons/l10n_se/models/template_se.py @@ -34,5 +34,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'a3960', 'account_journal_early_pay_discount_loss_account_id': 'a9993', 'account_journal_early_pay_discount_gain_account_id': 'a9994', + 'account_sale_tax_id': 'sale_tax_25_goods', + 'account_purchase_tax_id': 'purchase_tax_25_goods', }, } diff --git a/addons/l10n_sg/models/template_sg.py b/addons/l10n_sg/models/template_sg.py index 5b41b02f2b3..adf577562a2 100644 --- a/addons/l10n_sg/models/template_sg.py +++ b/addons/l10n_sg/models/template_sg.py @@ -31,5 +31,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'account_account_853', 'account_journal_early_pay_discount_loss_account_id': 'account_account_800', 'account_journal_early_pay_discount_gain_account_id': 'account_account_856', + 'account_sale_tax_id': 'sg_sale_tax_sr_8', + 'account_purchase_tax_id': 'sg_purchase_tax_tx8_8', }, } diff --git a/addons/l10n_si/models/template_si.py b/addons/l10n_si/models/template_si.py index 89d24c867bb..acffaf11243 100644 --- a/addons/l10n_si/models/template_si.py +++ b/addons/l10n_si/models/template_si.py @@ -30,5 +30,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'gd_acc_125000', 'income_currency_exchange_account_id': 'gd_acc_777000', 'expense_currency_exchange_account_id': 'gd_acc_484000', + 'account_sale_tax_id': 'gd_taxr_3', + 'account_purchase_tax_id': 'gd_taxp_3', }, } diff --git a/addons/l10n_sk/models/template_sk.py b/addons/l10n_sk/models/template_sk.py index a0dc8816fdf..cc8e5ce220f 100644 --- a/addons/l10n_sk/models/template_sk.py +++ b/addons/l10n_sk/models/template_sk.py @@ -37,5 +37,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'chart_sk_646000', 'default_cash_difference_income_account_id': 'chart_sk_668000', 'default_cash_difference_expense_account_id': 'chart_sk_568000', + 'account_sale_tax_id': 'vy_tuz_20', + 'account_purchase_tax_id': 'vs_tuz_20', }, } diff --git a/addons/l10n_syscohada/models/template_syscohada.py b/addons/l10n_syscohada/models/template_syscohada.py index ad394050773..8121bdcd7a2 100644 --- a/addons/l10n_syscohada/models/template_syscohada.py +++ b/addons/l10n_syscohada/models/template_syscohada.py @@ -29,5 +29,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'pcg_676', 'account_journal_early_pay_discount_loss_account_id': 'pcg_6019', 'account_journal_early_pay_discount_gain_account_id': 'pcg_7019', + 'account_sale_tax_id': 'tva_sale_18', + 'account_purchase_tax_id': 'tva_purchase_18', }, } diff --git a/addons/l10n_th/models/template_th.py b/addons/l10n_th/models/template_th.py index 7ad44ab9152..6efb707ee83 100644 --- a/addons/l10n_th/models/template_th.py +++ b/addons/l10n_th/models/template_th.py @@ -26,5 +26,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'a_recv_pos', 'income_currency_exchange_account_id': 'a_income_gain', 'expense_currency_exchange_account_id': 'a_exp_loss', + 'account_sale_tax_id': 'tax_output_vat', + 'account_purchase_tax_id': 'tax_input_vat', }, } diff --git a/addons/l10n_tn/models/template_tn.py b/addons/l10n_tn/models/template_tn.py index d403a247606..31c2b1bde9e 100644 --- a/addons/l10n_tn/models/template_tn.py +++ b/addons/l10n_tn/models/template_tn.py @@ -31,5 +31,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'l10n_tn_709', 'default_cash_difference_income_account_id': 'l10n_tn_756', 'default_cash_difference_expense_account_id': 'l10n_tn_655', + 'account_sale_tax_id': 'l10n_tn_tax_vat_sale_19', + 'account_purchase_tax_id': 'l10n_tn_tax_vat_purchase_19_other_local', }, } diff --git a/addons/l10n_tr/models/template_tr.py b/addons/l10n_tr/models/template_tr.py index e1f5d64e131..1c513d1435a 100644 --- a/addons/l10n_tr/models/template_tr.py +++ b/addons/l10n_tr/models/template_tr.py @@ -30,5 +30,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_suspense_account_id': 'tr102999', 'account_journal_payment_debit_account_id': 'tr102997', 'account_journal_payment_credit_account_id': 'tr102998', + 'account_sale_tax_id': 'tr_vat_sale_18', + 'account_purchase_tax_id': 'tr_vat_purchase_18', }, } diff --git a/addons/l10n_tw/models/template_tw.py b/addons/l10n_tw/models/template_tw.py index 9ed3d839a6d..39f545cfaba 100644 --- a/addons/l10n_tw/models/template_tw.py +++ b/addons/l10n_tw/models/template_tw.py @@ -35,5 +35,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_journal_early_pay_discount_gain_account_id': 'tw_512400', 'default_cash_difference_income_account_id': 'tw_718500', 'default_cash_difference_expense_account_id': 'tw_718600', + 'account_sale_tax_id': 'tw_tax_sale_5', + 'account_purchase_tax_id': 'tw_tax_purchase_5', }, } diff --git a/addons/l10n_ua/models/template_ua_ias.py b/addons/l10n_ua/models/template_ua_ias.py index bc10fcf00cd..98d26ac8966 100644 --- a/addons/l10n_ua/models/template_ua_ias.py +++ b/addons/l10n_ua/models/template_ua_ias.py @@ -34,5 +34,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'ua_ias_1122', 'income_currency_exchange_account_id': 'ua_ias_2100', 'expense_currency_exchange_account_id': 'ua_ias_2500', + 'account_sale_tax_id': 'sale_tax_template_vat20', + 'account_purchase_tax_id': 'purchase_tax_template_vat20', }, } diff --git a/addons/l10n_ua/models/template_ua_psbo.py b/addons/l10n_ua/models/template_ua_psbo.py index 5eac8878c13..c21d68d9cf2 100644 --- a/addons/l10n_ua/models/template_ua_psbo.py +++ b/addons/l10n_ua/models/template_ua_psbo.py @@ -34,5 +34,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'ua_psbp_366', 'income_currency_exchange_account_id': 'ua_psbp_711', 'expense_currency_exchange_account_id': 'ua_psbp_942', + 'account_sale_tax_id': 'sale_tax_template_vat20_psbo', + 'account_purchase_tax_id': 'purchase_tax_template_vat20_psbo', }, } diff --git a/addons/l10n_uk/models/template_uk.py b/addons/l10n_uk/models/template_uk.py index aab513ba334..7e704aa6c9e 100644 --- a/addons/l10n_uk/models/template_uk.py +++ b/addons/l10n_uk/models/template_uk.py @@ -30,5 +30,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': '1104', 'income_currency_exchange_account_id': '7700', 'expense_currency_exchange_account_id': '7700', + 'account_sale_tax_id': 'ST11', + 'account_purchase_tax_id': 'PT11', }, } diff --git a/addons/l10n_uy/models/template_uy.py b/addons/l10n_uy/models/template_uy.py index afb94a57238..daf0683d068 100644 --- a/addons/l10n_uy/models/template_uy.py +++ b/addons/l10n_uy/models/template_uy.py @@ -29,5 +29,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'uy_code_5302', 'account_journal_early_pay_discount_loss_account_id': 'uy_code_5303', 'account_journal_early_pay_discount_gain_account_id': 'uy_code_4303', + 'account_sale_tax_id': 'vat1', + 'account_purchase_tax_id': 'vat4', }, } diff --git a/addons/l10n_ve/models/template_ve.py b/addons/l10n_ve/models/template_ve.py index ad937178a0c..8fb009ce19e 100644 --- a/addons/l10n_ve/models/template_ve.py +++ b/addons/l10n_ve/models/template_ve.py @@ -27,5 +27,7 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'account_activa_account_1122003', 'income_currency_exchange_account_id': 'account_activa_account_9212003', 'expense_currency_exchange_account_id': 'account_activa_account_9113006', + 'account_sale_tax_id': 'tax3sale', + 'account_purchase_tax_id': 'tax3purchase', }, } diff --git a/addons/l10n_vn/models/template_vn.py b/addons/l10n_vn/models/template_vn.py index 795587b9726..ce422718d0b 100644 --- a/addons/l10n_vn/models/template_vn.py +++ b/addons/l10n_vn/models/template_vn.py @@ -30,5 +30,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': 'chart635', 'account_journal_early_pay_discount_loss_account_id': 'chart9993', 'account_journal_early_pay_discount_gain_account_id': 'chart9994', + 'account_sale_tax_id': 'tax_sale_vat10', + 'account_purchase_tax_id': 'tax_purchase_vat10', }, } diff --git a/addons/l10n_za/models/template_za.py b/addons/l10n_za/models/template_za.py index 87478262d1d..afa93c0153f 100644 --- a/addons/l10n_za/models/template_za.py +++ b/addons/l10n_za/models/template_za.py @@ -33,5 +33,7 @@ class AccountChartTemplate(models.AbstractModel): 'expense_currency_exchange_account_id': '610340', 'default_cash_difference_income_account_id': '500110', 'default_cash_difference_expense_account_id': '610460', + 'account_sale_tax_id': 'ST1', + 'account_purchase_tax_id': 'PT15', }, }