[MERGE] forward port branch 10.0 up to 18456b9

1 files changed, 6 insertions, 6 deletions

diff --git a/odoo/fields.py b/odoo/fields.py
index e43c8ddabb6..91865fe1f77 100644
--- a/odoo/fields.py
+++ b/odoo/fields.py
@@ -925,15 +925,15 @@ class Field(object):
         for field in fields:
             for record in records:
                 record._cache[field] = field.convert_to_cache(False, record, validate=False)
-        with records.env.protecting(fields, records):
-            if isinstance(self.compute, basestring):
-                getattr(records, self.compute)()
-            else:
-                self.compute(records)
+        if isinstance(self.compute, basestring):
+            getattr(records, self.compute)()
+        else:
+            self.compute(records)
 
     def compute_value(self, records):
         """ Invoke the compute method on ``records``; the results are in cache. """
-        with records.env.do_in_draft():
+        fields = records._field_computed[self]
+        with records.env.do_in_draft(), records.env.protecting(fields, records):
             try:
                 self._compute_value(records)
             except (AccessError, MissingError):