[MERGE] Forward-port 7.0 up to 23cffab

1 files changed, 5 insertions, 3 deletions

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 5030a977f18..31a2c52f99d 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1709,16 +1709,18 @@ class ExportFormat(object):
         raise NotImplementedError()
 
     def base(self, data, token):
+        params = simplejson.loads(data)
         model, fields, ids, domain, import_compat = \
             operator.itemgetter('model', 'fields', 'ids', 'domain',
                                 'import_compat')(
-                simplejson.loads(data))
+                params)
 
         Model = request.session.model(model)
-        ids = ids or Model.search(domain, 0, False, False, request.context)
+        context = dict(req.context or {}, **params.get('context', {}))
+        ids = ids or Model.search(domain, 0, False, False, context)
 
         field_names = map(operator.itemgetter('name'), fields)
-        import_data = Model.export_data(ids, field_names, request.context).get('datas',[])
+        import_data = Model.export_data(ids, field_names, context).get('datas',[])
 
         if import_compat:
             columns_headers = field_names