diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-02-15 10:59:40 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-02-15 10:59:40 +0100 |
| commit | bc233c30e5b9d28c9576b50c6f75dadbdf2e35ea (patch) | |
| tree | ffadfea5a36040b12635e11acdc4237d5a953db8 /addons/web/static/src/js/data_import.js | |
| parent | 5ab1b4f37ef93952567939444196cd9a91b92f02 (diff) | |
| parent | 750c5db2a30f89593cbd64137e765b11d5226808 (diff) | |
[FIX] Merge last trunk
bzr revid: fme@openerp.com-20120215095940-2jv27t91i7u5mm0r
Diffstat (limited to 'addons/web/static/src/js/data_import.js')
| -rw-r--r-- | addons/web/static/src/js/data_import.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js index 18870ca2157..4bcdd4dd1df 100644 --- a/addons/web/static/src/js/data_import.js +++ b/addons/web/static/src/js/data_import.js @@ -109,9 +109,10 @@ openerp.web.DataImport = openerp.web.Dialog.extend({ _(fields).each(function (field, field_name) { // Ignore spec for id field // Don't import function fields (function and related) - if (field_name === 'id' || 'function' in field) { + if (field_name === 'id' || field.readonly) { return; } + var f = { id: field_name, name: field_name, |