Merge lp:~unifield-team/unifield-web/web-UF-1369 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/widgets/form/_m2m.py'
--- addons/openerp/widgets/form/_m2m.py	2012-07-03 13:02:43 +0000
+++ addons/openerp/widgets/form/_m2m.py	2012-10-24 15:45:48 +0000
@@ -102,16 +102,11 @@
         if isinstance(ids, tuple):
             ids = list(ids)
 
-        if ids and current.limit != -1 and not params.sort_key:
-            ids = ids[current.offset: current.offset+current.limit]
-
         if self.name == params.source and params.sort_key and ids:
+            # reorder ids based on supplier criteria (sort_key, sort_order)
             domain = current.domain or []
             domain.append(('id', 'in', ids))
-            limit = current.limit
-            if current.limit == -1:
-                limit = 0
-            ids = rpc.RPCProxy(self.model).search(domain, current.offset, limit, params.sort_key+ ' '+params.sort_order, current.context)
+            ids = rpc.RPCProxy(self.model).search(domain, 0, 0, params.sort_key+ ' '+params.sort_order, current.context)
             id = ids[0]
 
         if current.view_mode: view_mode = current.view_mode

=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2012-08-13 14:26:51 +0000
+++ addons/openerp/widgets/listgrid.py	2012-10-24 15:45:48 +0000
@@ -182,6 +182,12 @@
             else:
                 self.count = proxy.search_count(search_param, context)
 
+        if not default_data and self.m2m:
+            # prefilter datas for m2m
+            # XXX: make it explicit about how 'sum' are computed as this is going to change default behaviour
+            if ids and self.limit not in (0, -1):
+                ids = self.ids[self.offset:self.offset+self.limit]
+
         self.data_dict = {}
         data = []
 
@@ -210,7 +216,8 @@
             for item in data:
                 self.data_dict[item['id']] = item.copy()
 
-            self.ids = ids
+            if not self.m2m:
+                self.ids = ids
         elif kw.get('default_data', []):
             data = kw['default_data']