[MERGE] forward port of branch saas-10 up to bb8f0f1

1 files changed, 2 insertions, 1 deletions

diff --git a/addons/web/static/src/js/widgets/data_export.js b/addons/web/static/src/js/widgets/data_export.js
index 4b87d45ff4a..14cdc4c5e3e 100644
--- a/addons/web/static/src/js/widgets/data_export.js
+++ b/addons/web/static/src/js/widgets/data_export.js
@@ -6,6 +6,7 @@ var crash_manager = require('web.crash_manager');
 var data = require('web.data');
 var Dialog = require('web.Dialog');
 var framework = require('web.framework');
+var pyeval = require('web.pyeval');
 
 var QWeb = core.qweb;
 var _t = core._t;
@@ -431,7 +432,7 @@ var DataExport = Dialog.extend({
                 fields: exported_fields,
                 ids: this.ids_to_export,
                 domain: this.domain,
-                context: this.dataset.context,
+                context: pyeval.eval('contexts', [this.dataset._model.context()]),
                 import_compat: !!this.$import_compat_radios.filter(':checked').val(),
             })},
             complete: framework.unblockUI,