diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 3839380f54f..1e0bd87f383 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1420,7 +1420,7 @@ class Import(View): @openerpweb.httprequest def detect_data(self, req, model, csvfile, csvsep, csvdel, csvcode, - csvskip, file_has_headers, jsonp): + csvskip, jsonp): try: data = list(csv.reader( csvfile, quotechar=str(csvdel), delimiter=str(csvsep))) @@ -1449,7 +1449,7 @@ class Import(View): @openerpweb.httprequest def import_data(self, req, model, csvfile, csvsep, csvdel, csvcode, csvskip, - file_has_headers, jsonp): + jsonp): context = req.session.eval_context(req.context) modle_obj = req.session.model(model) diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js index 9d77a68e54f..3998c437727 100644 --- a/addons/web/static/src/js/data_import.js +++ b/addons/web/static/src/js/data_import.js @@ -33,7 +33,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({ this.model = parent.model; this.fields = []; this.all_fields = []; - this.required_fields; + this.required_fields = null; var convert_fields = function (root, prefix) { prefix = prefix || ''; @@ -128,9 +128,10 @@ openerp.web.DataImport = openerp.web.Dialog.extend({ var result_node = this.$element.find("#result"); if (results['records']) { + var with_headers = this.$element.find('#file_has_headers').prop('checked'); result_node.append(QWeb.render('ImportView.result', { - 'headers': results.records[0], - 'records': results.records.slice(1) + 'headers': with_headers ? results.records[0] : null, + 'records': with_headers ? results.records.slice(1) : results.records })); } else if (results['error']) { result_node.append(QWeb.render('ImportView.error', { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index db7663ed60d..354189ac4a5 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1407,8 +1407,7 @@ + id="file_has_headers"/> @@ -1435,12 +1434,12 @@ - + -
+