diff options
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/data_import.js | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js index 1d191d03f1f..6901c16037e 100644 --- a/addons/web/static/src/js/data_import.js +++ b/addons/web/static/src/js/data_import.js @@ -267,8 +267,13 @@ openerp.web.DataImport = openerp.web.Dialog.extend({ f = _(fields).detect(function (field) { // TODO: levenshtein between header and field.string return field.name === name - || field.string.toLowerCase() === name.toLowerCase(); }); + if (!f) { + f = _(fields).detect(function (field) { + // TODO: levenshtein between header and field.string + return field.string.toLowerCase() === name.toLowerCase(); + }); + } if (f) { return f.name; } // if ``name`` is a path (o2m), we need to recurse through its .fields @@ -279,8 +284,13 @@ openerp.web.DataImport = openerp.web.Dialog.extend({ f = _(fields).detect(function (field) { // field.name for o2m is $foo/id, so we want to match on id return field.id === column_name - || field.string.toLowerCase() === column_name.toLowerCase() }); + if (!f) { + f = _(fields).detect(function (field) { + // field.name for o2m is $foo/id, so we want to match on id + return field.string.toLowerCase() === column_name.toLowerCase() + }); + } if (!f) { return undefined; } // if we found a matching field for the first path section, recurse in |