Merge PR #1916 into 16.0

Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2024-07-22 23:05:09 +00:00
2 changed files with 12 additions and 2 deletions

View File

@@ -543,6 +543,14 @@ class TestAccountChartUpdate(common.TransactionCase):
self.assertEqual(self.tax.description, self.tax_template.description) self.assertEqual(self.tax.description, self.tax_template.description)
self.assertEqual(self.account.code, self.account_template.code) self.assertEqual(self.account.code, self.account_template.code)
self.assertEqual(self.fp.name, self.fp_template.name) self.assertEqual(self.fp.name, self.fp_template.name)
fp_id = wizard.find_fp_by_templates(self.fp_template)
fp_rec = self.env["account.fiscal.position"].browse(fp_id)
expected_xmlid = "{}.{}_{}".format(
"account_chart_update",
wizard.company_id.id,
"account_fiscal_position_template-{}".format(self.fp_template.id),
)
self.assertEqual(fp_rec.get_external_id().get(fp_id), expected_xmlid)
wizard.unlink() wizard.unlink()
# Test match by another field, there is no match by XML-ID # Test match by another field, there is no match by XML-ID
@@ -613,6 +621,7 @@ class TestAccountChartUpdate(common.TransactionCase):
self.assertTrue(list(self.tax.get_external_id().values())[0]) self.assertTrue(list(self.tax.get_external_id().values())[0])
self.assertTrue(list(self.account.get_external_id().values())[0]) self.assertTrue(list(self.account.get_external_id().values())[0])
self.assertTrue(list(self.fp.get_external_id().values())[0]) self.assertTrue(list(self.fp.get_external_id().values())[0])
self.assertEqual(fp_rec.get_external_id().get(fp_id), expected_xmlid)
wizard.unlink() wizard.unlink()
# Test 2 recreate XML-ID # Test 2 recreate XML-ID
@@ -642,4 +651,5 @@ class TestAccountChartUpdate(common.TransactionCase):
self.assertTrue(list(self.tax.get_external_id().values())[0]) self.assertTrue(list(self.tax.get_external_id().values())[0])
self.assertTrue(list(self.account.get_external_id().values())[0]) self.assertTrue(list(self.account.get_external_id().values())[0])
self.assertTrue(list(self.fp.get_external_id().values())[0]) self.assertTrue(list(self.fp.get_external_id().values())[0])
self.assertEqual(fp_rec.get_external_id().get(fp_id), expected_xmlid)
wizard.unlink() wizard.unlink()

View File

@@ -1100,14 +1100,14 @@ class WizardUpdateChartsAccounts(models.TransientModel):
ir_model_data.search( ir_model_data.search(
[("model", "=", real_obj._name), ("res_id", "=", real_obj.id)] [("model", "=", real_obj._name), ("res_id", "=", real_obj.id)]
).unlink() ).unlink()
template_xmlid.copy( new_rec = template_xmlid.copy(
{ {
"model": real_obj._name, "model": real_obj._name,
"res_id": real_obj.id, "res_id": real_obj.id,
"name": new_xml_id,
"noupdate": True, "noupdate": True,
} }
) )
new_rec.name = new_xml_id
def _update_taxes(self): def _update_taxes(self):
"""Process taxes to create/update/deactivate.""" """Process taxes to create/update/deactivate."""