[merge]

bzr revid: nicolas.vanhoren@openerp.com-20120217101731-3g9hrhs65qb32pkv

1 files changed, 12 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..83eea2cccbb 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -109,9 +109,20 @@ 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') {
                 return;
             }
+            // Skip if there's no state which could disable @readonly,
+            // if a field is ever always readonly we can't import it
+            if (field.readonly) {
+                // no states at all
+                if (_.isEmpty(field.states)) { return; }
+                // no state altering @readonly
+                if (!_.any(field.states, function (modifiers) {
+                    return _(modifiers).chain().pluck(0).contains('readonly').value();
+                })) { return; }
+            }
+
             var f = {
                 id: field_name,
                 name: field_name,