From 5695adf5e64724311cb5bca5c291afb193ed2fa3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 31 May 2011 12:15:18 +0200
Subject: [PATCH] [IMP] @editable on forms and fields is nonsense, on trees it
 should only be able to take the values 'top' and 'bottom'

bzr revid: xmo@openerp.com-20110531101518-1ycw1fjy5vczcf8g
---
 openerp/addons/base/ir/ir.xml    |  2 +-
 openerp/addons/base/rng/view.rng | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 8647063a450..8b39ac925b2 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1895,7 +1895,7 @@
             <field name="name">Config Wizard Steps</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form editable="bottom" string="Config Wizard Steps">
+                <form string="Config Wizard Steps">
                     <group colspan="4" col="6">
                         <field name="action_id"/>
                         <field name="restart"/>
diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index cff1887afac..cd2aac5cb13 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -72,7 +72,6 @@
         <rng:element name="form">
             <rng:ref name="overload"/>
             <rng:optional><rng:attribute name="string"/></rng:optional>
-            <rng:optional><rng:attribute name="editable"/></rng:optional>
             <rng:optional><rng:attribute name="type"/></rng:optional>
             <rng:optional><rng:attribute name="link"/></rng:optional>
             <rng:ref name="container"/>
@@ -126,7 +125,14 @@
             <rng:optional><rng:attribute name="string"/></rng:optional>
             <rng:optional><rng:attribute name="colors"/></rng:optional>
             <rng:optional><rng:attribute name="color"/></rng:optional>
-            <rng:optional><rng:attribute name="editable"/></rng:optional>
+            <rng:optional>
+              <rng:attribute name="editable">
+                <rng:choice>
+                  <rng:value>top</rng:value>
+                  <rng:value>bottom</rng:value>
+                </rng:choice>
+              </rng:attribute>
+            </rng:optional>
             <rng:optional><rng:attribute name="toolbar"/></rng:optional>
             <rng:optional><rng:attribute name="link"/></rng:optional>
             <rng:optional><rng:attribute name="type"/></rng:optional>
@@ -412,7 +418,6 @@
             <rng:attribute name="name" />
             <rng:ref name="overload"/>
             <rng:ref name="access_rights"/>
-            <rng:optional><rng:attribute name="editable"/></rng:optional>
             <rng:optional><rng:attribute name="domain_filter"/></rng:optional>
             <rng:optional><rng:attribute name="attrs"/></rng:optional>
             <rng:optional><rng:attribute name="string"/></rng:optional>