From 0e4962391ef8cf253bca5e4e8e1004ac4b3a6878 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 4 Dec 2009 11:58:21 +0100
Subject: [PATCH] [IMP] rename res.configurable to res.config: inheriting from
 it makes an object a config item

bzr revid: xmo@tinyerp.com-20091204105821-7133uv5p1b7n4euz
---
 bin/addons/base/ir/ir.xml         | 2 +-
 bin/addons/base/res/res_config.py | 2 +-
 bin/addons/base/res/res_user.py   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 9d538a8a155..f36f51c0a93 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1413,7 +1413,7 @@
 
         <record id="action_start_configurator" model="ir.actions.server">
           <field name="name">Start Configuration</field>
-          <field name="model_id" ref="model_res_configurable"/>
+          <field name="model_id" ref="model_res_config"/>
           <field name="state">code</field>
           <field name="code">action = self.next(cr, uid)</field>
         </record>
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 39c10ea72c4..45abb8eef7e 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -23,7 +23,7 @@ from osv import osv
 import netsvc
 
 class res_config_configurable(osv.osv_memory):
-    _name = 'res.configurable'
+    _name = 'res.config'
     logger = netsvc.Logger()
 
     def _next_action(self, cr, uid):
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 298b7282a7e..e0396a6d975 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -252,14 +252,14 @@ users()
 class config_users(osv.osv_memory):
     _name = 'res.config.users'
     _table = 'res_users'
-    _inherit = 'res.configurable'
+    _inherit = 'res.config'
 
     _columns = users._columns
     _defaults = users._defaults
 
     def user_data(self, cr, uid, context=None):
         ''' Gets the purely user part of the current config_user
-        instance, without the fields inherited from res.configurable
+        instance, without the fields inherited from res.config
         '''
         return self.read(cr, uid, uid,
                          users._columns.keys(),
@@ -296,7 +296,7 @@ groups2()
 
 class res_config_view(osv.osv_memory):
     _name = 'res.config.view'
-    _inherit = 'res.configurable'
+    _inherit = 'res.config'
     _columns = {
         'name':fields.char('Name', size=64),
         'view': fields.selection([('simple','Simplified Interface'),('extended','Extended Interface')], 'View Mode', required=True ),