[MERGE] forward port branch saas-15 up to dde62073baf

1 files changed, 8 insertions, 9 deletions

diff --git a/odoo/models.py b/odoo/models.py
index 6949a5b9d45..bff10e28b38 100644
--- a/odoo/models.py
+++ b/odoo/models.py
@@ -2554,10 +2554,6 @@ class BaseModel(object):
                 else:
                     records &= self._in_cache_without(f)
 
-        # prefetch at most PREFETCH_MAX records
-        if len(records) > PREFETCH_MAX:
-            records = records[:PREFETCH_MAX] | self
-
         # fetch records with read()
         assert self in records and field in fs
         records = records.with_prefetch(self._prefetch)
@@ -4682,13 +4678,16 @@ class BaseModel(object):
         return RecordCache(self)
 
     @api.model
-    def _in_cache_without(self, field):
-        """ Make sure ``self`` is present in cache (for prefetching), and return
-            the records of model ``self`` in cache that have no value for ``field``
-            (:class:`Field` instance).
+    def _in_cache_without(self, field, limit=PREFETCH_MAX):
+        """ Return records to prefetch that have no value in cache for ``field``
+            (:class:`Field` instance), including ``self``.
+            Return at most ``limit`` records.
         """
         ids = filter(None, self._prefetch[self._name] - set(self.env.cache[field]))
-        return self.browse(ids)
+        recs = self.browse(ids)
+        if limit and len(recs) > limit:
+            recs = self + (recs - self)[:(limit - len(self))]
+        return recs
 
     @api.model
     def refresh(self):