From c120ee72a6af5fcc01899a557a6e2e5f9a59eedd Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 9 Feb 2012 10:02:14 +0100 Subject: [PATCH] [CNG] don't filter out function fields from import or export, only readonly fields bzr revid: xmo@openerp.com-20120209090214-84d6jjr1jnf32kpi --- addons/web/controllers/main.py | 2 -- addons/web/static/src/js/data_import.js | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index e81a4459de5..32bee4f1c6e 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1433,8 +1433,6 @@ class Export(View): if import_compat: if exclude and field_name in exclude: continue - if 'function' in field: - continue if field.get('readonly'): # If none of the field's states unsets readonly, skip the field if all(dict(attrs).get('readonly', True) 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,