summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2011-12-16 12:49:41 +0100
committerXavier Morel <xmo@openerp.com>2011-12-16 12:49:41 +0100
commit2989c829f760df5bc182510146d67fdf9a877908 (patch)
tree9bfacda3a3b116cdfed7ef70555e538f20657c10 /addons/web/static/src
parentc9b93aea944dc01dd2e5efc342bd6725e6181222 (diff)
[FIX] exclude function fields from import_compatible export and from all imports
bzr revid: xmo@openerp.com-20111216114941-fr6wsfabxfqf86xw
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/data_import.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index 7f4af7b35bb..3d626db125d 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -111,7 +111,11 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
});
}
_(fields).each(function (field, field_name) {
- if (field_name === 'id') { return; }
+ // Ignore spec for id field
+ // Don't import function fields (function and related)
+ if (field_name === 'id' || 'function' in field) {
+ return;
+ }
var f = {
id: field_name,
name: field_name,