[MERGE] forward port of branch saas-6 up to df95b1f

The changes in `l10n_es` [1] have been ignored. They will be ported to
the new accouting later.

[1] See 730890f3696e8117eec429bc302e5b67bee69fa0 and e3e5cfe82c43d9701858bd643e02df390f5f6f66

1 files changed, 4 insertions, 2 deletions

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index d489bc49474..496a25bc9ab 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -396,9 +396,11 @@ var DataImport = Widget.extend(ControlPanelMixin, {
         var fields = this.$('.oe_import_fields input.oe_import_match_field').map(function (index, el) {
             return $(el).select2('val') || false;
         }).get();
+        var tracking_disable = 'tracking_disable' in kwargs ? kwargs.tracking_disable : !this.$('#oe_import_tracking').prop('checked')
+        delete kwargs.tracking_disable
         kwargs.context = _.extend(
             {}, this.parent_context,
-            {tracking_disable: !this.$('#oe_import_tracking').prop('checked')}
+            {tracking_disable: tracking_disable}
         );
         return this.Import.call('do', [this.id, fields, this.import_options()], kwargs)
             .then(undefined, function (error, event) {
@@ -414,7 +416,7 @@ var DataImport = Widget.extend(ControlPanelMixin, {
             }) ;
     },
     onvalidate: function () {
-        return this.call_import({ dryrun: true })
+        return this.call_import({ dryrun: true, tracking_disable: true })
             .done(this.proxy('validated'));
     },
     onimport: function () {