diff --git a/addons/account/models/account_tax.py b/addons/account/models/account_tax.py index 476c56d7b87..65af6577f24 100644 --- a/addons/account/models/account_tax.py +++ b/addons/account/models/account_tax.py @@ -186,6 +186,7 @@ class AccountTax(models.Model): ('name', '=', record.name), ('type_tax_use', '=', record.type_tax_use), ('tax_scope', '=', record.tax_scope), + ('country_id', '=', record.country_id.id), ('id', '!=', record.id), ]) if duplicates := self.search(expression.OR(domains)): @@ -383,6 +384,8 @@ class AccountTax(models.Model): name += ' (%s)' % tax_scope.get(record.tax_scope) if len(self.env.companies) > 1 and self.env.context.get('params', {}).get('model') == 'product.template': name += ' (%s)' % record.company_id.display_name + if record.country_id != record.company_id.account_fiscal_country_id: + name += ' (%s)' % record.country_code record.display_name = name @api.onchange('amount') diff --git a/addons/account/tests/test_multivat.py b/addons/account/tests/test_multivat.py index 98169e68f99..e2f3a460709 100644 --- a/addons/account/tests/test_multivat.py +++ b/addons/account/tests/test_multivat.py @@ -100,8 +100,8 @@ def data_method_provider(chart_template_name, country_code): 'account.tax': { xmlid: _tax_vals(name, amount, external_id_prefix) for name, xmlid, amount in ( - (f'{external_id_prefix}Tax 1', 'test_tax_1_template', 15), - (f'{external_id_prefix}Tax 2', 'test_tax_2_template', 0), + ('Tax 1', 'test_tax_1_template', 15), + ('Tax 2', 'test_tax_2_template', 0), ) }, }