[MERGE] forward port of branch 9.0 up to bfbe2d6

# Conflicts:
#	addons/marketing/i18n/es_PE.po
#	addons/marketing/i18n/hu.po

1 files changed, 11 insertions, 3 deletions

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 5c57ff708f5..496a25bc9ab 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -237,7 +237,13 @@ var DataImport = Widget.extend(ControlPanelMixin, {
         if (!this.$('input.oe_import_file').val()) { return; }
 
         this.$el.removeClass('oe_import_preview oe_import_error');
-        this.$el.find('.oe_import_toggle').toggle((this.$('input.oe_import_file')[0].files[0].type == "text/csv"));
+        var import_toggle = false;
+        var file = this.$('input.oe_import_file')[0].files[0];
+        // some platforms send text/csv, application/csv, or other things if Excel is prevent
+        if ((file.type && _.last(file.type.split('/')) === "csv") || ( _.last(file.name.split('.')) === "csv")) {
+            import_toggle = true;
+        }
+        this.$el.find('.oe_import_toggle').toggle(import_toggle);
         jsonp(this.$el, {
             url: '/base_import/set_file'
         }, this.proxy('settings_changed'));
@@ -390,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) {
@@ -408,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 () {