diff --git a/account_chart_update/__manifest__.py b/account_chart_update/__manifest__.py index b0392e60a..54aa9588f 100644 --- a/account_chart_update/__manifest__.py +++ b/account_chart_update/__manifest__.py @@ -8,7 +8,7 @@ { 'name': "Detect changes and update the Account Chart from a template", "summary": "Wizard to update a company's account chart from a template", - 'version': "11.0.1.0.0", + 'version': "11.0.1.0.1", 'author': "Tecnativa, " "BCIM, " "Okia, " diff --git a/account_chart_update/tests/test_account_chart_update.py b/account_chart_update/tests/test_account_chart_update.py index bfdfec4cb..553be153b 100644 --- a/account_chart_update/tests/test_account_chart_update.py +++ b/account_chart_update/tests/test_account_chart_update.py @@ -90,6 +90,12 @@ class TestAccountChartUpdate(common.HttpCase): self.tax_group = self.env['account.tax.group'].create({ 'name': 'Test tax group', }) + self.account_tag_1 = self.env['account.account.tag'].create({ + 'name': 'Test account tag 1', + }) + self.account_tag_2 = self.env['account.account.tag'].create({ + 'name': 'Test account tag 2', + }) self.company = self.env['res.company'].create({ 'name': 'Test account_chart_update company', 'currency_id': self.chart_template.currency_id.id, @@ -214,6 +220,9 @@ class TestAccountChartUpdate(common.HttpCase): self.tax_template.tax_group_id = self.tax_group.id self.tax_template.refund_account_id = new_account_tmpl.id self.account_template.name = "Other name" + self.account_template.tag_ids = [ + (6, 0, [self.account_tag_1.id, self.account_tag_2.id]), + ] self.fp_template.note = "Test note" self.fp_template.account_ids.account_dest_id = new_account_tmpl.id self.fp_template.tax_ids.tax_dest_id = self.tax_template.id @@ -239,6 +248,8 @@ class TestAccountChartUpdate(common.HttpCase): self.assertEqual(self.tax.tax_group_id, self.tax_group) self.assertEqual(self.tax.refund_account_id, new_account) self.assertEqual(self.account.name, self.account_template.name) + self.assertIn(self.account_tag_1, self.account.tag_ids) + self.assertIn(self.account_tag_2, self.account.tag_ids) self.assertEqual(self.fp.note, self.fp_template.note) self.assertEqual(self.fp.account_ids.account_dest_id, new_account) self.assertEqual(self.fp.tax_ids.tax_dest_id, self.tax) diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py index 8457748e2..c164ec127 100644 --- a/account_chart_update/wizard/wizard_chart_update.py +++ b/account_chart_update/wizard/wizard_chart_update.py @@ -422,8 +422,10 @@ class WizardUpdateChartsAccounts(models.TransientModel): result[key] = expected elif template[key] != real[key]: result[key] = template[key] - if isinstance(result.get(key, False), models.Model): - # Avoid to cache recordset references + # Avoid to cache recordset references + if isinstance(real._fields[key], fields.Many2many): + result[key] = [(6, 0, result[key].ids)] + elif isinstance(real._fields[key], fields.Many2one): result[key] = result[key].id except KeyError: pass