[FIX] util.update_record_from_xml: correctly handle from_module

When loading a record from another module, we should only search for
fully-qualified xmlids.

Part-of: odoo/upgrade#5267

Author: KangOl

src/base/tests/test_util.py

@@ -737,6 +737,26 @@ def test_update_record_translations_from_xml(self):
             for fname, value in field_to_value.items():
                 self.assertEqual(template_record.with_context(lang=lang)[fname], value)
 
+    def test_update_record_from_xml__from_module(self):
+        cr = self.env.cr
+        if not util.module_installed(cr, "web"):
+            self.skip()
+
+        layout = self.env.ref("web.report_layout")
+        new_name = str(uuid.uuid4())
+
+        layout.write({"name": new_name})
+        util.flush(layout)
+        util.invalidate(layout)
+
+        # the record `base.report_layout` does not exists, so we must pass the `force_create`.
+        # we only test that it won't update `web.report_layout`.
+        util.update_record_from_xml(cr, "base.report_layout", from_module="web", force_create=True)
+        util.invalidate(layout)
+
+        # web.layout should NOT have been updated
+        self.assertEqual(layout.name, new_name)
+
     def test_ensure_xmlid_match_record(self):
         cr = self.env.cr
         tx1 = self.env["res.currency"].create({"name": "TX1", "symbol": "TX1"})

src/util/records.py

@@ -749,11 +749,18 @@ def update_record_from_xml(
         cr.execute("SELECT write_uid, write_date, id FROM {} WHERE id=%s".format(table), [res_id])
         write_data = cr.fetchone()
 
-    xpath = "//*[@id='{module}.{name}' or @id='{name}']".format(module=module, name=name)
+    from_module = from_module or module
+
+    id_match = (
+        "@id='{module}.{name}' or @id='{name}'".format(module=module, name=name)
+        if module == from_module
+        else "@id='{module}.{name}'".format(module=module, name=name)
+    )
+    xpath = "//*[{}]".format(id_match)
+
     # use a data tag inside openerp tag to be compatible with all supported versions
     new_root = lxml.etree.fromstring("<openerp><data/></openerp>")
 
-    from_module = from_module or module
     manifest = get_manifest(from_module)
     template = False
     extra_references = []