audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] account_chart_update: Handle updated m2m correctly

Browse Source
This commit is contained in:
Pedro M. Baeza
2018-09-21 23:24:53 +02:00
committed by Reyes4711
parent 26ff1f0ffd
commit c5a6eb2bf4
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_chart_update/__manifest__.py
View File

@@ -8,7 +8,7 @@
{ {
'name': "Detect changes and update the Account Chart from a template", 'name': "Detect changes and update the Account Chart from a template",
"summary": "Wizard to update a company's 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, " 'author': "Tecnativa, "
"BCIM, " "BCIM, "
"Okia, " "Okia, "

11
account_chart_update/tests/test_account_chart_update.py
View File

@@ -90,6 +90,12 @@ class TestAccountChartUpdate(common.HttpCase):
self.tax_group = self.env['account.tax.group'].create({ self.tax_group = self.env['account.tax.group'].create({
'name': 'Test tax group', '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({ self.company = self.env['res.company'].create({
'name': 'Test account_chart_update company', 'name': 'Test account_chart_update company',
'currency_id': self.chart_template.currency_id.id, '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.tax_group_id = self.tax_group.id
self.tax_template.refund_account_id = new_account_tmpl.id self.tax_template.refund_account_id = new_account_tmpl.id
self.account_template.name = "Other name" 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.note = "Test note"
self.fp_template.account_ids.account_dest_id = new_account_tmpl.id self.fp_template.account_ids.account_dest_id = new_account_tmpl.id
self.fp_template.tax_ids.tax_dest_id = self.tax_template.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.tax_group_id, self.tax_group)
self.assertEqual(self.tax.refund_account_id, new_account) self.assertEqual(self.tax.refund_account_id, new_account)
self.assertEqual(self.account.name, self.account_template.name) 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.note, self.fp_template.note)
self.assertEqual(self.fp.account_ids.account_dest_id, new_account) self.assertEqual(self.fp.account_ids.account_dest_id, new_account)
self.assertEqual(self.fp.tax_ids.tax_dest_id, self.tax) self.assertEqual(self.fp.tax_ids.tax_dest_id, self.tax)

6
account_chart_update/wizard/wizard_chart_update.py
View File

@@ -422,8 +422,10 @@ class WizardUpdateChartsAccounts(models.TransientModel):
result[key] = expected result[key] = expected
elif template[key] != real[key]: elif template[key] != real[key]:
result[key] = template[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 result[key] = result[key].id
except KeyError: except KeyError:
pass pass