[MERGE] forward port branch saas-11.1 up to 726b91b9fbc

1 files changed, 4 insertions, 1 deletions

diff --git a/addons/base_import/static/src/js/import_action.js b/addons/base_import/static/src/js/import_action.js
index a0558e36053..ee9e95fa5a0 100644
--- a/addons/base_import/static/src/js/import_action.js
+++ b/addons/base_import/static/src/js/import_action.js
@@ -323,6 +323,7 @@ var DataImport = Widget.extend(ControlPanelMixin, {
         this.$('.oe_import_float_decimal_separator').val(result.options.float_decimal_separator).change();
         if (result.debug === false){
             this.$('.oe_import_tracking').hide();
+            this.$('.oe_import_deferparentstore').hide();
         }
 
         var $fields = this.$('.oe_import_fields input');
@@ -461,10 +462,12 @@ var DataImport = Widget.extend(ControlPanelMixin, {
             return $(el).select2('val') || false;
         }).get();
         var tracking_disable = 'tracking_disable' in kwargs ? kwargs.tracking_disable : !this.$('#oe_import_tracking').prop('checked')
+        var defer_parent_store = 'defer_parent_store' in kwargs ? kwargs.defer_parent_store : !!this.$('#oe_import_deferparentstore').prop('checked')
         delete kwargs.tracking_disable;
+        delete kwargs.defer_parent_store;
         kwargs.context = _.extend(
             {}, this.parent_context,
-            {tracking_disable: tracking_disable}
+            {tracking_disable: tracking_disable, defer_parent_store_computation: defer_parent_store}
         );
         return this._rpc({
                 model: 'base_import.import',