[MERGE] forward port branch saas-12 up to 10cde43

1 files changed, 7 insertions, 3 deletions

diff --git a/odoo/fields.py b/odoo/fields.py
index 4d3f43f0fa7..d6dfe499f28 100644
--- a/odoo/fields.py
+++ b/odoo/fields.py
@@ -1898,6 +1898,10 @@ class Many2one(_Relational):
     def convert_to_display_name(self, value, record):
         return ustr(value.display_name)
 
+    def convert_to_onchange(self, value, record, fnames=()):
+        if not value.id:
+            return False
+        return super(Many2one, self).convert_to_onchange(value, record, fnames)
 
 class UnionUpdate(SpecialValue):
     """ Placeholder for a value update; when this value is taken from the cache,
@@ -1923,10 +1927,10 @@ class _RelationalMulti(_Relational):
         """ Update the cached value of ``self`` for ``records`` with ``value``. """
         for record in records:
             if self in record._cache:
-                value = self.convert_to_cache(record[self.name] | value, record, validate=False)
+                val = self.convert_to_cache(record[self.name] | value, record, validate=False)
             else:
-                value = UnionUpdate(self, record, value)
-            record._cache[self] = value
+                val = UnionUpdate(self, record, value)
+            record._cache[self] = val
 
     def convert_to_cache(self, value, record, validate=True):
         # cache format: tuple(ids)