From 6c8eef526f0fd8e21beabbd3fd1919e3dcd7c7ba Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 2 Dec 2009 12:21:22 +0100
Subject: [PATCH 01/48] [fix] remove import of xml.xpath, death to pyxml

bzr revid: xmo@tinyerp.com-20091202112122-taugkps2909a62b3
---
 bin/addons/base/ir/ir_actions.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 5f95f3bebdb..b11ec3418cd 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -28,13 +28,7 @@ import netsvc
 import re
 import copy
 import sys
-
-try:
-    from xml import dom, xpath
-except ImportError:
-    sys.stderr.write("ERROR: Import xpath module\n")
-    sys.stderr.write("ERROR: Try to install the old python-xml package\n")
-    sys.exit(2)
+from xml import dom
 
 class actions(osv.osv):
     _name = 'ir.actions.actions'

From b608b4568295e0b184359360e6f261d007a191fa Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 2 Dec 2009 19:20:21 +0100
Subject: [PATCH 02/48] [IMP] Style fixes, 80c clamping

bzr revid: xmo@tinyerp.com-20091202182021-uzj8zkxjiiuwo0d5
---
 bin/addons/base/ir/ir_actions.py | 74 ++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 32 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index b11ec3418cd..438ce6a8442 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -428,7 +428,7 @@ class actions_server(osv.osv):
         result = cr.fetchall() or []
         res = []
         for rs in result:
-            if not rs[0] == None and not rs[1] == None:
+            if rs[0] is not None and rs[1] is not None:
                 res.append(rs)
         return res
 
@@ -576,8 +576,8 @@ class actions_server(osv.osv):
             if action.state=='client_action':
                 if not action.action_id:
                     raise osv.except_osv(_('Error'), _("Please specify an action to launch !"))
-                result = self.pool.get(action.action_id.type).read(cr, uid, action.action_id.id, context=context)
-                return result
+                return self.pool.get(action.action_id.type)\
+                    .read(cr, uid, action.action_id.id, context=context)
 
             if action.state == 'code':
                 localdict = {
@@ -767,67 +767,77 @@ class ir_actions_configuration_wizard(osv.osv_memory):
     _name='ir.actions.configuration.wizard'
     def next_configuration_action(self,cr,uid,context={}):
         item_obj = self.pool.get('ir.actions.todo')
-        item_ids = item_obj.search(cr, uid, [('type','=','configure'),('state', '=', 'open'),('active','=',True)], limit=1, context=context)
-        if item_ids and len(item_ids):
-            item = item_obj.browse(cr, uid, item_ids[0], context=context)
-            return item
+        item_ids = item_obj.search(cr, uid,
+                                   [('type','=','configure'),
+                                    ('state', '=', 'open'),
+                                    ('active','=',True)],
+                                   limit=1, context=context)
+        if item_ids:
+            return item_obj.browse(cr, uid, item_ids[0], context=context)
         return False
     def _get_action_name(self, cr, uid, context={}):
-        next_action=self.next_configuration_action(cr,uid,context=context)
+        next_action = self.next_configuration_action(cr,uid,context=context)
         if next_action:
             return next_action.note
         else:
             return "Your database is now fully configured.\n\nClick 'Continue' and enjoy your OpenERP experience..."
-        return False
 
     def _get_action(self, cr, uid, context={}):
-        next_action=self.next_configuration_action(cr,uid,context=context)
+        next_action = self.next_configuration_action(cr, uid, context=context)
         if next_action:
             return next_action.id
-        return False
+        return
 
-    def _progress_get(self,cr,uid, context={}):
-        total = self.pool.get('ir.actions.todo').search_count(cr, uid, [], context)
-        todo = self.pool.get('ir.actions.todo').search_count(cr, uid, [('type','=','configure'),('active','=',True),('state','<>','open')], context)
+    def _progress_get(self, cr, uid, context=None):
+        total = self.pool.get('ir.actions.todo')\
+            .search_count(cr, uid, [], context)
+        todo = self.pool.get('ir.actions.todo')\
+            .search_count(cr, uid,[('type','=','configure'),
+                                   ('active','=',True),
+                                   ('state','<>','open')],
+                          context)
         if total > 0.0:
-            return max(5.0,round(todo*100/total))
+            return max(5.0, round(todo*100/total))
         else:
             return 100.0
 
     _columns = {
-        'name': fields.text('Next Wizard',readonly=True),
+        'name': fields.text('Next Wizard', readonly=True),
         'progress': fields.float('Configuration Progress', readonly=True),
-        'item_id':fields.many2one('ir.actions.todo', 'Next Configuration Wizard',invisible=True, readonly=True),
+        'item_id': fields.many2one('ir.actions.todo',
+                                  'Next Configuration Wizard',
+                                  invisible=True, readonly=True),
     }
     _defaults={
         'progress': _progress_get,
-        'item_id':_get_action,
-        'name':_get_action_name,
+        'item_id': _get_action,
+        'name': _get_action_name,
     }
     def button_next(self,cr,uid,ids,context=None):
-        user_action=self.pool.get('res.users').browse(cr,uid,uid)
-        act_obj=self.pool.get(user_action.menu_id.type)
-        action_ids=act_obj.search(cr,uid,[('name','=',user_action.menu_id.name)])
-        action_open=act_obj.browse(cr,uid,action_ids)[0]
-        if context.get('menu',False):
-            return{
+        user_action = self.pool.get('res.users').browse(cr,uid,uid)
+        act_obj = self.pool.get(user_action.menu_id.type)
+        action_ids = act_obj.search(cr,uid,[
+                ('name', '=', user_action.menu_id.name)])
+        action_open = act_obj.browse(cr, uid, action_ids)[0]
+        if context and 'menu' in context:
+            return {
                 'view_type': action_open.view_type,
-                'view_id':action_open.view_id and [action_open.view_id.id] or False,
+                'view_id': action_open.view_id and [action_open.view_id.id] or False,
                 'res_model': action_open.res_model,
                 'type': action_open.type,
-                'domain':action_open.domain
+                'domain': action_open.domain
             }
-        return {'type':'ir.actions.act_window_close'}
+        return {'type': 'ir.actions.act_window_close'}
 
     def button_skip(self,cr,uid,ids,context=None):
         item_obj = self.pool.get('ir.actions.todo')
-        item_id=self.read(cr,uid,ids)[0]['item_id']
+        item_id = self.read(cr,uid,ids)[0]['item_id']
         if item_id:
             item = item_obj.browse(cr, uid, item_id, context=context)
             item_obj.write(cr, uid, item.id, {
                 'state': 'skip',
                 }, context=context)
-            return{
+            return {
                 'view_type': 'form',
                 "view_mode": 'form',
                 'res_model': 'ir.actions.configuration.wizard',
@@ -838,13 +848,13 @@ class ir_actions_configuration_wizard(osv.osv_memory):
 
     def button_continue(self, cr, uid, ids, context=None):
         item_obj = self.pool.get('ir.actions.todo')
-        item_id=self.read(cr,uid,ids)[0]['item_id']
+        item_id = self.read(cr,uid,ids)[0]['item_id']
         if item_id:
             item = item_obj.browse(cr, uid, item_id, context=context)
             item_obj.write(cr, uid, item.id, {
                 'state': 'done',
                 }, context=context)
-            return{
+            return {
                   'view_mode': item.action_id.view_mode,
                   'view_type': item.action_id.view_type,
                   'view_id':item.action_id.view_id and [item.action_id.view_id.id] or False,

From e593be387f3a3c3cc9cce5e09d821f05239051b6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 2 Dec 2009 19:24:51 +0100
Subject: [PATCH 03/48] [rem] actually remove name_search which was partially
 removed in mga@tinyerp.com-20090916102521-m5xmlbmle8y2zc64 instead of leaving
 it commented

bzr revid: xmo@tinyerp.com-20091202182451-ai0ra2m1uxrnx1kq
---
 bin/addons/base/ir/ir_actions.py | 53 --------------------------------
 1 file changed, 53 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 438ce6a8442..dcdbf319cfc 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -343,59 +343,6 @@ class ir_model_fields(osv.osv):
     _columns = {
         'complete_name': fields.char('Complete Name', size=64, select=1),
     }
-
-    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=80):
-        return super(ir_model_fields, self).name_search(cr, uid, name, args, operator, context, limit)
-#        def get_fields(cr, uid, field, rel):
-#            result = []
-#            mobj = self.pool.get('ir.model')
-#            id = mobj.search(cr, uid, [('model','=',rel)])
-
-#            obj = self.pool.get('ir.model.fields')
-#            ids = obj.search(cr, uid, [('model_id','in',id)])
-#            records = obj.read(cr, uid, ids)
-#            for record in records:
-#                id = record['id']
-#                fld = field + '/' + record['name']
-
-#                result.append((id, fld))
-#            return result
-
-#        if not args:
-#            args=[]
-#        if not context:
-#            context={}
-#            return super(ir_model_fields, self).name_search(cr, uid, name, args, operator, context, limit)
-
-#        if context.get('key') != 'server_action':
-#            return super(ir_model_fields, self).name_search(cr, uid, name, args, operator, context, limit)
-#        result = []
-#        obj = self.pool.get('ir.model.fields')
-#        ids = obj.search(cr, uid, args)
-#        records = obj.read(cr, uid, ids)
-#        for record in records:
-#            id = record['id']
-#            field = record['name']
-
-#            if record['ttype'] == 'many2one':
-#                rel = record['relation']
-#                res = get_fields(cr, uid, field, record['relation'])
-#                for rs in res:
-#                    result.append(rs)
-
-#            result.append((id, field))
-
-#        for rs in result:
-#            obj.write(cr, uid, [rs[0]], {'complete_name':rs[1]})
-
-#        iids = []
-#        for rs in result:
-#            iids.append(rs[0])
-
-#        result = super(ir_model_fields, self).name_search(cr, uid, name, [('complete_name','ilike',name), ('id','in',iids)], operator, context, limit)
-
-#        return result
-
 ir_model_fields()
 
 class server_object_lines(osv.osv):

From 40050f1230474cca066c71f1f3cfaaa30dcd51c5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 3 Dec 2009 13:31:10 +0100
Subject: [PATCH 04/48] [IMP] add new handler for addons configuration,
 corresponding menu item

bzr revid: xmo@tinyerp.com-20091203123110-r1v2vycpe92bvvxc
---
 bin/addons/base/ir/ir.xml        |  7 ++++++
 bin/addons/base/ir/ir_actions.py | 37 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index ea4273950a0..60d63b3464a 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1411,5 +1411,12 @@
         </record>
         <menuitem action="action_config_wizard_form" id="menu_config_module" parent="base.next_id_11"/>
 
+        <record id="action_start_configurator" model="ir.actions.server">
+          <field name="name">Start Configuration</field>
+          <field name="model_id" ref="model_ir_actions_configurator"/>
+          <field name="state">code</field>
+          <field name="code">action = self.next(cr, uid)</field>
+        </record>
+        <menuitem action="action_start_configurator" id="menu_configurator_module" parent="next_id_11" type="server"/>
     </data>
 </openerp>
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index dcdbf319cfc..f8c6dfa8810 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -812,5 +812,42 @@ class ir_actions_configuration_wizard(osv.osv_memory):
         return self.button_next(cr, uid, ids, context)
 ir_actions_configuration_wizard()
 
+class ir_actions_configurator(osv.osv_memory):
+    _name = 'ir.actions.configurator'
+    logger = netsvc.Logger()
+    def next_action(self, cr, uid, context=None):
+        todos = self.pool.get('ir.actions.todo')
+        self.logger.notifyChannel('actions', netsvc.LOG_INFO,
+                                  'getting next %s' % todos)
+        active_todos = todos.search(cr, uid,
+                                [('type','=','configure'),
+                                 ('state', '=', 'open'),
+                                 ('active','=',True)],
+                                limit=1, context=None)
+        if active_todos:
+            return todos.browse(cr, uid, active_todos[0], context=None)
+        return None
+
+    def next(self, cr, uid):
+        self.logger.notifyChannel('actions', netsvc.LOG_INFO,
+                                  'getting next operation')
+        next = self.next_action(cr, uid)
+        self.logger.notifyChannel('actions', netsvc.LOG_INFO,
+                                  'next action is %s' % next)
+        if next:
+            self.pool.get('ir.actions.todo').write(cr, uid, next.id, {
+                    'state':'done',
+                    }, context=None)
+            action = next.action_id
+            return {
+                'view_mode': action.view_mode,
+                'view_type': action.view_type,
+                'view_id': action.view_id and [action.view_id.id] or False,
+                'res_model': action.res_model,
+                'type': action.type,
+                'target': action.target,
+                }
+        return {'type': 'ir.actions.act_window_close'}
+ir_actions_configurator()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 08f7728ff8f9f6ca293072a0c7f6af66bb7cf6fb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 3 Dec 2009 14:09:04 +0100
Subject: [PATCH 05/48] [IMP] migrate res.user and res.config.view to the new
 configurator

bzr revid: xmo@tinyerp.com-20091203130904-9ndprgw23f4jc0ne
---
 bin/addons/base/ir/ir_actions.py |  3 +++
 bin/addons/base/res/res_user.py  | 34 +++++---------------------------
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index f8c6dfa8810..5662422b4b3 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -847,6 +847,9 @@ class ir_actions_configurator(osv.osv_memory):
                 'type': action.type,
                 'target': action.target,
                 }
+        self.logger.notifyChannel(
+            'actions', netsvc.LOG_INFO,
+            'all configuration actions have been executed')
         return {'type': 'ir.actions.act_window_close'}
 ir_actions_configurator()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d6b7cd6eec0..7fc985a70e5 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -255,22 +255,11 @@ class users(osv.osv):
         return dataobj.browse(cr, uid, data_id, context).res_id
 
     def action_next(self,cr,uid,ids,context=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
+        return self.pool.get('ir.actions.configurator').next(cr, uid)
 
     def action_continue(self,cr,uid,ids,context={}):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
+        return self.pool.get('ir.actions.configurator').next(cr, uid)
+
     def action_new(self,cr,uid,ids,context={}):
         return {
                 'view_type': 'form',
@@ -301,13 +290,7 @@ class res_config_view(osv.osv_memory):
     }
 
     def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
+        return self.pool.get('ir.actions.configurator').next(cr, uid)
     def action_set(self, cr, uid, ids, context=None):
         res=self.read(cr,uid,ids)[0]
         users_obj = self.pool.get('res.users')
@@ -318,14 +301,7 @@ class res_config_view(osv.osv_memory):
                 users_obj.write(cr, uid, [uid],{
                                 'groups_id':[(4,group_ids[0])]
                             }, context=context)
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-            }
-
+        return self.pool.get('ir.actions.configurator').next(cr, uid)
 res_config_view()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 97013e9aae34261d1be840568d7d271eb34321d2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 3 Dec 2009 16:11:22 +0100
Subject: [PATCH 06/48] [IMP] modify configurator for inheritability, move it
 to res_config, make res_config_view inherit from res.configurable

bzr revid: xmo@tinyerp.com-20091203151122-md545zxjs7rlyddk
---
 bin/addons/base/ir/ir.xml         |  2 +-
 bin/addons/base/ir/ir_actions.py  | 40 ------------------
 bin/addons/base/res/__init__.py   |  1 +
 bin/addons/base/res/res_config.py | 69 +++++++++++++++++++++++++++++++
 bin/addons/base/res/res_user.py   | 10 ++---
 5 files changed, 76 insertions(+), 46 deletions(-)
 create mode 100644 bin/addons/base/res/res_config.py

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 60d63b3464a..9d538a8a155 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_ir_actions_configurator"/>
+          <field name="model_id" ref="model_res_configurable"/>
           <field name="state">code</field>
           <field name="code">action = self.next(cr, uid)</field>
         </record>
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 5662422b4b3..dcdbf319cfc 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -812,45 +812,5 @@ class ir_actions_configuration_wizard(osv.osv_memory):
         return self.button_next(cr, uid, ids, context)
 ir_actions_configuration_wizard()
 
-class ir_actions_configurator(osv.osv_memory):
-    _name = 'ir.actions.configurator'
-    logger = netsvc.Logger()
-    def next_action(self, cr, uid, context=None):
-        todos = self.pool.get('ir.actions.todo')
-        self.logger.notifyChannel('actions', netsvc.LOG_INFO,
-                                  'getting next %s' % todos)
-        active_todos = todos.search(cr, uid,
-                                [('type','=','configure'),
-                                 ('state', '=', 'open'),
-                                 ('active','=',True)],
-                                limit=1, context=None)
-        if active_todos:
-            return todos.browse(cr, uid, active_todos[0], context=None)
-        return None
-
-    def next(self, cr, uid):
-        self.logger.notifyChannel('actions', netsvc.LOG_INFO,
-                                  'getting next operation')
-        next = self.next_action(cr, uid)
-        self.logger.notifyChannel('actions', netsvc.LOG_INFO,
-                                  'next action is %s' % next)
-        if next:
-            self.pool.get('ir.actions.todo').write(cr, uid, next.id, {
-                    'state':'done',
-                    }, context=None)
-            action = next.action_id
-            return {
-                'view_mode': action.view_mode,
-                'view_type': action.view_type,
-                'view_id': action.view_id and [action.view_id.id] or False,
-                'res_model': action.res_model,
-                'type': action.type,
-                'target': action.target,
-                }
-        self.logger.notifyChannel(
-            'actions', netsvc.LOG_INFO,
-            'all configuration actions have been executed')
-        return {'type': 'ir.actions.act_window_close'}
-ir_actions_configurator()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/bin/addons/base/res/__init__.py b/bin/addons/base/res/__init__.py
index d8b335f590f..66278c82087 100644
--- a/bin/addons/base/res/__init__.py
+++ b/bin/addons/base/res/__init__.py
@@ -25,6 +25,7 @@ import country
 import bank
 import res_lang
 import partner
+import res_config
 import res_currency
 import res_company
 import res_user
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
new file mode 100644
index 00000000000..39c10ea72c4
--- /dev/null
+++ b/bin/addons/base/res/res_config.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv
+import netsvc
+
+class res_config_configurable(osv.osv_memory):
+    _name = 'res.configurable'
+    logger = netsvc.Logger()
+
+    def _next_action(self, cr, uid):
+        todos = self.pool.get('ir.actions.todo')
+        self.logger.notifyChannel('actions', netsvc.LOG_INFO,
+                                  'getting next %s' % todos)
+        active_todos = todos.search(cr, uid,
+                                [('type','=','configure'),
+                                 ('state', '=', 'open'),
+                                 ('active','=',True)],
+                                limit=1, context=None)
+        if active_todos:
+            return todos.browse(cr, uid, active_todos[0], context=None)
+        return None
+
+    def _next(self, cr, uid):
+        self.logger.notifyChannel('actions', netsvc.LOG_INFO,
+                                  'getting next operation')
+        next = self._next_action(cr, uid)
+        self.logger.notifyChannel('actions', netsvc.LOG_INFO,
+                                  'next action is %s' % next)
+        if next:
+            self.pool.get('ir.actions.todo').write(cr, uid, next.id, {
+                    'state':'done',
+                    }, context=None)
+            action = next.action_id
+            return {
+                'view_mode': action.view_mode,
+                'view_type': action.view_type,
+                'view_id': action.view_id and [action.view_id.id] or False,
+                'res_model': action.res_model,
+                'type': action.type,
+                'target': action.target,
+                }
+        self.logger.notifyChannel(
+            'actions', netsvc.LOG_INFO,
+            'all configuration actions have been executed')
+        return {'type': 'ir.actions.act_window_close'}
+    def next(self, cr, uid, *args, **kwargs):
+        return self._next(cr, uid)
+res_config_configurable()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 7fc985a70e5..943d6931c38 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -120,7 +120,6 @@ def _companies_get(self,cr, uid, context={}):
 class users(osv.osv):
     __admin_ids = {}
     _name = "res.users"
-    #_log_access = False
     
     def get_current_company(self, cr, uid):
         res=[]
@@ -255,10 +254,10 @@ class users(osv.osv):
         return dataobj.browse(cr, uid, data_id, context).res_id
 
     def action_next(self,cr,uid,ids,context=None):
-        return self.pool.get('ir.actions.configurator').next(cr, uid)
+        return self.pool.get('res.configurable').next(cr, uid)
 
     def action_continue(self,cr,uid,ids,context={}):
-        return self.pool.get('ir.actions.configurator').next(cr, uid)
+        return self.pool.get('res.configurable').next(cr, uid)
 
     def action_new(self,cr,uid,ids,context={}):
         return {
@@ -281,6 +280,7 @@ groups2()
 
 class res_config_view(osv.osv_memory):
     _name='res.config.view'
+    _inherit='res.configurable'
     _columns = {
         'name':fields.char('Name', size=64),
         'view': fields.selection([('simple','Simplified Interface'),('extended','Extended Interface')], 'View Mode', required=True ),
@@ -290,7 +290,7 @@ class res_config_view(osv.osv_memory):
     }
 
     def action_cancel(self,cr,uid,ids,conect=None):
-        return self.pool.get('ir.actions.configurator').next(cr, uid)
+        return self.next(cr, uid)
     def action_set(self, cr, uid, ids, context=None):
         res=self.read(cr,uid,ids)[0]
         users_obj = self.pool.get('res.users')
@@ -301,7 +301,7 @@ class res_config_view(osv.osv_memory):
                 users_obj.write(cr, uid, [uid],{
                                 'groups_id':[(4,group_ids[0])]
                             }, context=context)
-        return self.pool.get('ir.actions.configurator').next(cr, uid)
+        return self.next(cr, uid)
 res_config_view()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 02e431c411c4518f62e36e902142ef62dd309545 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 4 Dec 2009 11:15:43 +0100
Subject: [PATCH 07/48] [IMP] make users configurable via res.configurable

Create a new user configuration object (res.config.users) whose job is to
create new users instance and interact with the related views

bzr revid: xmo@tinyerp.com-20091204101543-qpqfhaqvrpqfpcyi
---
 bin/addons/base/base_update.xml |  6 ++--
 bin/addons/base/res/res_user.py | 64 ++++++++++++++++++++-------------
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 8af8d8667b2..e6bdd16f758 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -198,8 +198,8 @@
         </record>
 
         <record id="view_users_configuration_form" model="ir.ui.view">
-            <field name="name">res.users.confirm.form</field>
-            <field name="model">res.users</field>
+            <field name="name">res.config.users.confirm.form</field>
+            <field name="model">res.config.users</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure User">
@@ -239,7 +239,7 @@
         <record id="action_config_user_form" model="ir.actions.act_window">
             <field name="name">Configure User</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.users</field>
+            <field name="res_model">res.config.users</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_users_configuration_form"/>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 943d6931c38..298b7282a7e 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -247,29 +247,46 @@ class users(osv.osv):
             if k.startswith('context_'):
                 result[k[8:]] = getattr(user,k)
         return result
-
-    def action_get(self, cr, uid, context={}):
-        dataobj = self.pool.get('ir.model.data')
-        data_id = dataobj._get_id(cr, 1, 'base', 'action_res_users_my')
-        return dataobj.browse(cr, uid, data_id, context).res_id
-
-    def action_next(self,cr,uid,ids,context=None):
-        return self.pool.get('res.configurable').next(cr, uid)
-
-    def action_continue(self,cr,uid,ids,context={}):
-        return self.pool.get('res.configurable').next(cr, uid)
-
-    def action_new(self,cr,uid,ids,context={}):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'res.users',
-                'view_id':self.pool.get('ir.ui.view').search(cr,uid,[('name','=','res.users.confirm.form')]),
-                'type': 'ir.actions.act_window',
-                'target':'new',
-               }
 users()
 
+class config_users(osv.osv_memory):
+    _name = 'res.config.users'
+    _table = 'res_users'
+    _inherit = 'res.configurable'
+
+    _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
+        '''
+        return self.read(cr, uid, uid,
+                         users._columns.keys(),
+                         context=context)
+    def create_user(self, cr, uid, context=None):
+        ''' create a new res.user instance from the data stored
+        in the current res.config.users
+        '''
+        self.pool.get('res.users').create(
+            cr, uid, self.user_data(cr, uid, context), context)
+    
+    def action_next(self, cr, uid, ids, context=None):
+        return self.next(cr, uid)
+
+    def action_new(self, cr, uid, ids, context=None):
+        self.create_user(cr, uid, context=context)
+        return {
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'res.config.users',
+            'view_id':self.pool.get('ir.ui.view')\
+                .search(cr,uid,[('name','=','res.config.users.confirm.form')]),
+            'type': 'ir.actions.act_window',
+            'target':'new',
+            }
+config_users()
+
 class groups2(osv.osv): ##FIXME: Is there a reason to inherit this object ?
     _inherit = 'res.groups'
     _columns = {
@@ -277,10 +294,9 @@ class groups2(osv.osv): ##FIXME: Is there a reason to inherit this object ?
     }
 groups2()
 
-
 class res_config_view(osv.osv_memory):
-    _name='res.config.view'
-    _inherit='res.configurable'
+    _name = 'res.config.view'
+    _inherit = 'res.configurable'
     _columns = {
         'name':fields.char('Name', size=64),
         'view': fields.selection([('simple','Simplified Interface'),('extended','Extended Interface')], 'View Mode', required=True ),

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 08/48] [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 ),

From de37555dd9b71f5e1a958bc57e6dbb8533e9cd14 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 4 Dec 2009 13:14:52 +0100
Subject: [PATCH 09/48] [ADD] integrate progress bars into configuration
 dialogs

bzr revid: xmo@tinyerp.com-20091204121452-3eibzrgingec5xd9
---
 bin/addons/base/base_update.xml   | 14 ++++++++++----
 bin/addons/base/res/res_config.py | 21 ++++++++++++++++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index e6bdd16f758..cac68d65048 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -227,8 +227,11 @@
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
                     </notebook>
-                    <label string="" colspan="2"/>
-                    <group col="2" colspan="2">
+
+                    <field name="progress" widget="progressbar"
+                           nolabel="1" colspan='1'/>
+                    <label string='' colspan='1'/>
+                    <group col="4" colspan="2">
                         <button icon='gtk-cancel' special="cancel" name="action_next" type='object' string='Skip'/>
                         <button name='action_new' icon='gtk-ok' type='object' string='Add User'/>
                     </group>
@@ -257,8 +260,11 @@
                     <label string="Choose the simplified interface if you are testing OpenERP for the first time. Less used options or fields are automatically hidden. You will be able to change this, later, through the Administration menu." colspan="4" align="0.0"/>
                     <newline/>
                     <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group colspan="2" col="1">
+
+                    <field name="progress" widget="progressbar" nolabel="1"
+                           colspan="1" />
+                    <label string='' colspan='1'/>
+                    <group colspan="2" col="2">
                         <button icon="gtk-ok" name="action_set" string="Set" type="object"/>
                     </group>
                 </form>
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 45abb8eef7e..3760173fcdb 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -19,13 +19,32 @@
 #
 ##############################################################################
 
-from osv import osv
+from osv import osv, fields
 import netsvc
 
 class res_config_configurable(osv.osv_memory):
     _name = 'res.config'
     logger = netsvc.Logger()
 
+    def _progress(self, cr, uid, context=None):
+        total = self.pool.get('ir.actions.todo')\
+            .search_count(cr, uid, [], context)
+        open = self.pool.get('ir.actions.todo')\
+            .search_count(cr, uid,[('type','=','configure'),
+                                   ('active','=',True),
+                                   ('state','<>','open')],
+                          context)
+        if total:
+            return round(open*100./total)
+        return 100.
+
+    _columns = dict(
+        progress=fields.float('Configuration Progress', readonly=True),
+        )
+    _defaults = dict(
+        progress=_progress
+        )
+
     def _next_action(self, cr, uid):
         todos = self.pool.get('ir.actions.todo')
         self.logger.notifyChannel('actions', netsvc.LOG_INFO,

From 37efa6b55ecab67204d18674939e570721975fb1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 4 Dec 2009 14:13:07 +0100
Subject: [PATCH 10/48] [IMP] Remove todo name, move note/description to the
 content of the corresponding view

bzr revid: xmo@tinyerp.com-20091204131307-zechrzr50xz6wghs
---
 bin/addons/base/base_update.xml  | 22 ++++++++++------------
 bin/addons/base/ir/ir_actions.py |  2 --
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index cac68d65048..febb7cdb0ca 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -203,6 +203,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure User">
+                  <label colspan="4" align="0.0"
+                         string='You will be able to assign groups to users.
+                    Groups define the access rights of each users on the
+                    different objects of the system.'/>
                     <separator string="Define New Users" colspan="4"/>
                     <field name="name" select="1"/>
                     <field name="active" select="1"/>
@@ -255,10 +259,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure simple view">
+                  <label colspan="4" align="0.0" string='
+                    Choose between the "Simplified Interface" or the extended one.
+                    If you are testing or using OpenERP for the first time, we suggest you to use
+                    the simplified interface, which has less options and fields but is easier to
+                    understand. You will be able to switch to the extended view later.
+                  '/>
                     <separator string="Choose Your Mode" colspan="4"/>
                     <field colspan="2" name="view"/>
-                    <label string="Choose the simplified interface if you are testing OpenERP for the first time. Less used options or fields are automatically hidden. You will be able to change this, later, through the Administration menu." colspan="4" align="0.0"/>
-                    <newline/>
                     <separator string="" colspan="4"/>
 
                     <field name="progress" widget="progressbar" nolabel="1"
@@ -287,21 +295,11 @@
     </data>
     <data noupdate="1">
         <record id="config_wizard_step_user" model="ir.actions.todo">
-            <field name="name">Create User</field>
-            <field name="note">Create your users.
-You will be able to assign groups to users. Groups define the access rights of each users on the different objects of the system.
-            </field>
             <field name="action_id" ref="action_config_user_form"/>
             <field name="sequence">10</field>
         </record>
 
         <record id="config_wizard_simple_view" model="ir.actions.todo">
-            <field name="name">Select Your Interface</field>
-            <field name="note">Choose between the "Simplified Interface" or the extended one.
-If you are testing or using OpenERP for the first time, we suggest you to use
-the simplified interface, which has less options and fields but is easier to
-understand. You will be able to switch to the extended view later.
-            </field>
             <field name="action_id" ref="action_config_simple_view_form"/>
             <field name="sequence">5</field>
         </record>
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index dcdbf319cfc..e3818a60ffe 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -687,8 +687,6 @@ act_window_close()
 class ir_actions_todo(osv.osv):
     _name = 'ir.actions.todo'
     _columns={
-        'name':fields.char('Name',size=64,required=True, select=True),
-        'note':fields.text('Text', translate=True),
         'start_date': fields.datetime('Start Date'),
         'end_date': fields.datetime('End Date'),
         'action_id':fields.many2one('ir.actions.act_window', 'Action', select=True,required=True, ondelete='cascade'),

From 1b8220ef5914bbcd2e7fe9eead658cb6bf12787f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 7 Dec 2009 11:12:41 +0100
Subject: [PATCH 11/48] [fix] forgotten references to removed name field

bzr revid: xmo@tinyerp.com-20091207101241-3tlni1s4j4tsu5bg
---
 bin/addons/base/ir/ir.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index f36f51c0a93..3690bb4cc12 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1346,7 +1346,6 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Config Wizard Steps">
-                    <field name="name" select="1"/>
                     <field name="action_id" select="1"/>
                     <field name="sequence"/>
                     <field name="state"/>
@@ -1360,12 +1359,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form editable="bottom" string="Config Wizard Steps">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
                     <field name="action_id" select="1"/>
                     <field name="sequence"/>
                     <field name="state"/>
-                    <field colspan="4" name="note"/>
+                    <field name="active" select="1"/>
                 </form>
             </field>
         </record>

From 2d43ae33ffbc3dafaa85760bdd70de8d2f512905 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 7 Dec 2009 11:17:40 +0100
Subject: [PATCH 12/48] [REM] Remove unused fields in the ir.actions.todo model

bzr revid: xmo@tinyerp.com-20091207101740-9qllhd695oxskls2
---
 bin/addons/base/ir/ir_actions.py  | 35 ++++++++++++-------------------
 bin/addons/base/res/res_config.py | 13 +++++-------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index e3818a60ffe..ec4825172e1 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -679,30 +679,24 @@ class act_window_close(osv.osv):
 act_window_close()
 
 # This model use to register action services.
-# if action type is 'configure', it will be start on configuration wizard.
-# if action type is 'service',
-#                - if start_type= 'at once', it will be start at one time on start date
-#                - if start_type='auto', it will be start on auto starting from start date, and stop on stop date
-#                - if start_type="manual", it will start and stop on manually
+TODO_STATES = [('open', 'Not Started'),
+               ('done', 'Done'),
+               ('skip','Skipped'),
+               ('cancel','Cancel')]
 class ir_actions_todo(osv.osv):
     _name = 'ir.actions.todo'
     _columns={
-        'start_date': fields.datetime('Start Date'),
-        'end_date': fields.datetime('End Date'),
-        'action_id':fields.many2one('ir.actions.act_window', 'Action', select=True,required=True, ondelete='cascade'),
-        'sequence':fields.integer('Sequence'),
+        'action_id': fields.many2one(
+            'ir.actions.act_window', 'Action', select=True, required=True,
+            ondelete='cascade'),
+        'sequence': fields.integer('Sequence'),
         'active': fields.boolean('Active'),
-        'type':fields.selection([('configure', 'Configure'),('service', 'Service'),('other','Other')], string='Type', required=True),
-        'start_on':fields.selection([('at_once', 'At Once'),('auto', 'Auto'),('manual','Manual')], string='Start On'),
-        'groups_id': fields.many2many('res.groups', 'res_groups_act_todo_rel', 'act_todo_id', 'group_id', 'Groups'),
-        'users_id': fields.many2many('res.users', 'res_users_act_todo_rel', 'act_todo_id', 'user_id', 'Users'),
-        'state':fields.selection([('open', 'Not Started'),('done', 'Done'),('skip','Skipped'),('cancel','Cancel')], string='State', required=True)
+        'state': fields.selection(TODO_STATES, string='State', required=True)
     }
     _defaults={
         'state': lambda *a: 'open',
         'sequence': lambda *a: 10,
-        'active':lambda *a:True,
-        'type':lambda *a:'configure'
+        'active': lambda *a: True,
     }
     _order="sequence"
 ir_actions_todo()
@@ -712,10 +706,8 @@ class ir_actions_configuration_wizard(osv.osv_memory):
     _name='ir.actions.configuration.wizard'
     def next_configuration_action(self,cr,uid,context={}):
         item_obj = self.pool.get('ir.actions.todo')
-        item_ids = item_obj.search(cr, uid,
-                                   [('type','=','configure'),
-                                    ('state', '=', 'open'),
-                                    ('active','=',True)],
+        item_ids = item_obj.search(cr, uid, [('state','=','open'),
+                                             ('active','=',True)],
                                    limit=1, context=context)
         if item_ids:
             return item_obj.browse(cr, uid, item_ids[0], context=context)
@@ -737,8 +729,7 @@ class ir_actions_configuration_wizard(osv.osv_memory):
         total = self.pool.get('ir.actions.todo')\
             .search_count(cr, uid, [], context)
         todo = self.pool.get('ir.actions.todo')\
-            .search_count(cr, uid,[('type','=','configure'),
-                                   ('active','=',True),
+            .search_count(cr, uid,[('active','=',True),
                                    ('state','<>','open')],
                           context)
         if total > 0.0:
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 3760173fcdb..299adfba687 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -30,9 +30,8 @@ class res_config_configurable(osv.osv_memory):
         total = self.pool.get('ir.actions.todo')\
             .search_count(cr, uid, [], context)
         open = self.pool.get('ir.actions.todo')\
-            .search_count(cr, uid,[('type','=','configure'),
-                                   ('active','=',True),
-                                   ('state','<>','open')],
+            .search_count(cr, uid, [('active','=',True),
+                                    ('state','<>','open')],
                           context)
         if total:
             return round(open*100./total)
@@ -49,11 +48,9 @@ class res_config_configurable(osv.osv_memory):
         todos = self.pool.get('ir.actions.todo')
         self.logger.notifyChannel('actions', netsvc.LOG_INFO,
                                   'getting next %s' % todos)
-        active_todos = todos.search(cr, uid,
-                                [('type','=','configure'),
-                                 ('state', '=', 'open'),
-                                 ('active','=',True)],
-                                limit=1, context=None)
+        active_todos = todos.search(cr, uid, [('state','=','open'),
+                                              ('active','=',True)],
+                                    limit=1, context=None)
         if active_todos:
             return todos.browse(cr, uid, active_todos[0], context=None)
         return None

From 62fcf40b9c5b1443c20e30fe2eaa71fcdb3d1a3b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 7 Dec 2009 11:21:50 +0100
Subject: [PATCH 13/48] [IMP] Reinstate old wording lost when removing name
 attribute from ir.actions.todo

bzr revid: xmo@tinyerp.com-20091207102150-s3cz0izodirnfoqw
---
 bin/addons/base/base_update.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index febb7cdb0ca..7ddc88e8bea 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -244,7 +244,7 @@
         </record>
 
         <record id="action_config_user_form" model="ir.actions.act_window">
-            <field name="name">Configure User</field>
+            <field name="name">Create Users</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.config.users</field>
             <field name="view_type">form</field>
@@ -280,7 +280,7 @@
         </record>
 
         <record id="action_config_simple_view_form" model="ir.actions.act_window">
-            <field name="name">Configure Simple View</field>
+            <field name="name">Select Your Interface</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.config.view</field>
             <field name="view_type">form</field>

From ad4eff0eb32bba44e5423613d8e8d2a14c6ee75e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 7 Dec 2009 16:40:50 +0100
Subject: [PATCH 14/48] [fix] forgot to remove a condition check

bzr revid: xmo@tinyerp.com-20091207154050-0cd3gr49xn219e9a
---
 bin/addons/base/ir/ir.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 3690bb4cc12..4dad43cb66c 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1371,7 +1371,6 @@
             <field name="res_model">ir.actions.todo</field>
             <field name="view_id" ref="ir_actions_todo_tree"/>
             <field name="view_type">form</field>
-            <field name="domain">[('type','=','configure')]</field>
         </record>
         <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="1"/>
         <menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form" parent="next_id_11"/>

From c47d3ab2752311778b075a5274e56d786990d44e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Mon, 7 Dec 2009 19:28:30 +0100
Subject: [PATCH 15/48] [IMP] renamings & reformattings of button names

bzr revid: xmo@tinyerp.com-20091207182830-27bpxe68g9o31j26
---
 bin/addons/base/base_update.xml | 9 ++++++---
 bin/addons/base/res/res_user.py | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 7ddc88e8bea..c6007f1a92b 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -236,8 +236,10 @@
                            nolabel="1" colspan='1'/>
                     <label string='' colspan='1'/>
                     <group col="4" colspan="2">
-                        <button icon='gtk-cancel' special="cancel" name="action_next" type='object' string='Skip'/>
-                        <button name='action_new' icon='gtk-ok' type='object' string='Add User'/>
+                        <button name="action_skip" icon="gtk-cancel" special="cancel"
+                                string='Skip' type='object'/>
+                        <button name='action_next' icon='gtk-ok'
+                                string='Add User' type='object'/>
                     </group>
                 </form>
             </field>
@@ -273,7 +275,8 @@
                            colspan="1" />
                     <label string='' colspan='1'/>
                     <group colspan="2" col="2">
-                        <button icon="gtk-ok" name="action_set" string="Set" type="object"/>
+                        <button name="action_next" icon="gtk-ok"
+                                string="Set" type="object"/>
                     </group>
                 </form>
             </field>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index e0396a6d975..ccf736a10a1 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -305,9 +305,9 @@ class res_config_view(osv.osv_memory):
         'view':lambda *args: 'simple',
     }
 
-    def action_cancel(self,cr,uid,ids,conect=None):
+    def action_skip(self,cr,uid,ids,conect=None):
         return self.next(cr, uid)
-    def action_set(self, cr, uid, ids, context=None):
+    def action_next(self, cr, uid, ids, context=None):
         res=self.read(cr,uid,ids)[0]
         users_obj = self.pool.get('res.users')
         group_obj=self.pool.get('res.groups')

From 31ad1a84be3535f952d7d137e5a90942c567d76c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 8 Dec 2009 14:09:08 +0100
Subject: [PATCH 16/48] [IMP] remove unused method action_skip on
 res.config.view

bzr revid: xmo@tinyerp.com-20091208130908-i14z2w3ips30ecyi
---
 bin/addons/base/res/res_user.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index ccf736a10a1..983f6df4e1d 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -305,8 +305,6 @@ class res_config_view(osv.osv_memory):
         'view':lambda *args: 'simple',
     }
 
-    def action_skip(self,cr,uid,ids,conect=None):
-        return self.next(cr, uid)
     def action_next(self, cr, uid, ids, context=None):
         res=self.read(cr,uid,ids)[0]
         users_obj = self.pool.get('res.users')

From 011023123da182ed6c463c907043489c3cf8df0e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 8 Dec 2009 14:09:44 +0100
Subject: [PATCH 17/48] [ADD] inheritable view for config items

bzr revid: xmo@tinyerp.com-20091208130944-7r0a19wvj3jxygnz
---
 bin/addons/base/__terp__.py        |  1 +
 bin/addons/base/base_update.xml    | 35 ++++++++++++++++--------------
 bin/addons/base/res/res_config.xml | 24 ++++++++++++++++++++
 3 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 bin/addons/base/res/res_config.xml

diff --git a/bin/addons/base/__terp__.py b/bin/addons/base/__terp__.py
index 186271d8611..8c2ccda94be 100644
--- a/bin/addons/base/__terp__.py
+++ b/bin/addons/base/__terp__.py
@@ -33,6 +33,7 @@
         'base_menu.xml',
         'security/base_security.xml',
         'res/res_security.xml',
+        'res/res_config.xml',
         'maintenance/maintenance_security.xml'
     ],
     'update_xml': [
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index c6007f1a92b..c8565616b8a 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -259,26 +259,28 @@
             <field name="name">res.users.confirm.simple_view</field>
             <field name="model">res.config.view</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Configure simple view">
+              <data>
+                <form position="attributes">
+                  <attribute name="string">Select your Interface</attribute>
+                </form>
+
+                <group string="res_config_contents" position="replace">
                   <label colspan="4" align="0.0" string='
-                    Choose between the "Simplified Interface" or the extended one.
-                    If you are testing or using OpenERP for the first time, we suggest you to use
+                    Choose between the simplified interface and the extended one.
+                    If you are testing or using OpenERP for the first time, we suggest you use
                     the simplified interface, which has less options and fields but is easier to
                     understand. You will be able to switch to the extended view later.
-                  '/>
-                    <separator string="Choose Your Mode" colspan="4"/>
-                    <field colspan="2" name="view"/>
-                    <separator string="" colspan="4"/>
-
-                    <field name="progress" widget="progressbar" nolabel="1"
-                           colspan="1" />
-                    <label string='' colspan='1'/>
-                    <group colspan="2" col="2">
-                        <button name="action_next" icon="gtk-ok"
-                                string="Set" type="object"/>
-                    </group>
-                </form>
+                    '/>
+                  <separator string="Choose Your Mode" colspan="4"/>
+                  <field colspan="2" name="view"/>
+                </group>
+                <xpath expr='//button[@name="action_skip"]' position='replace'/>
+                <xpath expr='//button[@name="action_next"]' position='attributes'>
+                  <attribute name='string'>Set</attribute>
+                </xpath>
+              </data>
             </field>
         </record>
 
@@ -287,6 +289,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.config.view</field>
             <field name="view_type">form</field>
+            <field name="view_id" ref="view_confirm_simple_view_form"/>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
new file mode 100644
index 00000000000..b193dae39c8
--- /dev/null
+++ b/bin/addons/base/res/res_config.xml
@@ -0,0 +1,24 @@
+<openerp>
+  <data>
+    <record id="res_config_view_base" model="ir.ui.view">
+      <field name="name">res.config.view.base</field>
+      <field name="model">res.config</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form>
+          <group string="res_config_contents">
+          </group>
+          <separator string="" colspan="4"/>
+          <field name="progress" widget="progressbar" nolabel="1" colspan="1"/>
+          <label string="" colspan="1"/>
+          <group colspan="2" col="4">
+            <button name="action_skip" icon="gtk-cancel" special="cancel"
+                    type="object" string="Skip"/>
+            <button name="action_next" icon="gtk-ok"
+                    type="object" string="Record"/>
+          </group>
+        </form>
+      </field>
+    </record>
+  </data>
+</openerp>

From 06a49e64019119a1ee6ed4c62ba06919b7fe48aa Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 8 Dec 2009 14:19:47 +0100
Subject: [PATCH 18/48] [IMP] add default implementation for action_skip

bzr revid: xmo@tinyerp.com-20091208131947-klb0njdri0nf95v2
---
 bin/addons/base/res/res_config.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 299adfba687..9902d3de890 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -80,6 +80,8 @@ class res_config_configurable(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
     def next(self, cr, uid, *args, **kwargs):
         return self._next(cr, uid)
+    def action_skip(self, cr, uid, *args, **kwargs):
+        return self._next(cr, uid)
 res_config_configurable()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From c2aeae60c42cb5c855f2ddd94b4ee6fbbb2085bb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 8 Dec 2009 14:53:06 +0100
Subject: [PATCH 19/48] [FIX] unbreak user creation

bzr revid: xmo@tinyerp.com-20091208135306-qcic48ugtff50aes
---
 bin/addons/base/base_update.xml | 2 +-
 bin/addons/base/res/res_user.py | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index c8565616b8a..53d9dab090c 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -238,7 +238,7 @@
                     <group col="4" colspan="2">
                         <button name="action_skip" icon="gtk-cancel" special="cancel"
                                 string='Skip' type='object'/>
-                        <button name='action_next' icon='gtk-ok'
+                        <button name='action_new' icon='gtk-ok'
                                 string='Add User' type='object'/>
                     </group>
                 </form>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 983f6df4e1d..c35a330f661 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -271,9 +271,6 @@ class config_users(osv.osv_memory):
         self.pool.get('res.users').create(
             cr, uid, self.user_data(cr, uid, context), context)
     
-    def action_next(self, cr, uid, ids, context=None):
-        return self.next(cr, uid)
-
     def action_new(self, cr, uid, ids, context=None):
         self.create_user(cr, uid, context=context)
         return {

From 4dbb8813e439e5a52065259f0f7a978a0c241250 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 8 Dec 2009 15:48:35 +0100
Subject: [PATCH 20/48] [FIX][IMP] fix creation of second user in a row, make
 user creation view inherit from res_config_view_base

bzr revid: xmo@tinyerp.com-20091208144835-pdf83mwe6x9xd37b
---
 bin/addons/base/base_update.xml | 73 +++++++++++++++++----------------
 bin/addons/base/res/res_user.py | 13 +++---
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 53d9dab090c..9f35794cc6f 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -201,47 +201,48 @@
             <field name="name">res.config.users.confirm.form</field>
             <field name="model">res.config.users</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Configure User">
+              <data>
+                <form position="attributes">
+                  <attribute name="string">Create User</attribute>
+                </form>
+
+                <group string="res_config_contents" position="replace">
                   <label colspan="4" align="0.0"
                          string='You will be able to assign groups to users.
                     Groups define the access rights of each users on the
                     different objects of the system.'/>
-                    <separator string="Define New Users" colspan="4"/>
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
-                    <field name="login" select="1"/>
-                    <field name="password" password="True"/>
-                    <notebook colspan="4">
-                        <page string="User">
-                            <field name="address_id"/>
-                            <field name="company_id" required="1"/>
-                            <field name="action_id" required="True"/>
-                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
-                            <field name="context_lang"/>
-                            <field name="context_tz"/>
-                            <field colspan="4" name="signature"/>
-                        </page>
-                        <page string="Groups">
-                            <label string="Groups are used to defined access rights on each screen and menu." align="0.0" colspan="4"/>
-                            <field colspan="4" nolabel="1" name="groups_id"/>
-                        </page>
-                        <page string="Roles">
-                            <label string="Roles are used to defined available actions, provided by workflows." align="0.0" colspan="4"/>
-                            <field colspan="4" nolabel="1" name="roles_id"/>
-                        </page>
-                    </notebook>
-
-                    <field name="progress" widget="progressbar"
-                           nolabel="1" colspan='1'/>
-                    <label string='' colspan='1'/>
-                    <group col="4" colspan="2">
-                        <button name="action_skip" icon="gtk-cancel" special="cancel"
-                                string='Skip' type='object'/>
-                        <button name='action_new' icon='gtk-ok'
-                                string='Add User' type='object'/>
-                    </group>
-                </form>
+                  <separator string="Define New Users" colspan="4"/>
+                  <field name="name" select="1"/>
+                  <field name="active" select="1"/>
+                  <field name="login" select="1"/>
+                  <field name="password" password="True"/>
+                  <notebook colspan="4">
+                    <page string="User">
+                      <field name="address_id"/>
+                      <field name="company_id" required="1"/>
+                      <field name="action_id" required="True"/>
+                      <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
+                      <field name="context_lang"/>
+                      <field name="context_tz"/>
+                      <field colspan="4" name="signature"/>
+                    </page>
+                    <page string="Groups">
+                      <label string="Groups are used to defined access rights on each screen and menu." align="0.0" colspan="4"/>
+                      <field colspan="4" nolabel="1" name="groups_id"/>
+                    </page>
+                    <page string="Roles">
+                      <label string="Roles are used to defined available actions, provided by workflows." align="0.0" colspan="4"/>
+                      <field colspan="4" nolabel="1" name="roles_id"/>
+                    </page>
+                  </notebook>
+                </group>
+                
+                <xpath expr='//button[@name="action_next"]' position='attributes'>
+                  <attribute name='string'>Add User</attribute>
+                </xpath>
+              </data>
             </field>
         </record>
 
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index c35a330f661..94cdc227545 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -251,28 +251,27 @@ users()
 
 class config_users(osv.osv_memory):
     _name = 'res.config.users'
-    _table = 'res_users'
     _inherit = 'res.config'
 
     _columns = users._columns
     _defaults = users._defaults
 
-    def user_data(self, cr, uid, context=None):
+    def user_data(self, cr, uid, new_id, context=None):
         ''' Gets the purely user part of the current config_user
         instance, without the fields inherited from res.config
         '''
-        return self.read(cr, uid, uid,
+        return self.read(cr, uid, new_id,
                          users._columns.keys(),
                          context=context)
-    def create_user(self, cr, uid, context=None):
+    def create_user(self, cr, uid, new_id, context=None):
         ''' create a new res.user instance from the data stored
         in the current res.config.users
         '''
         self.pool.get('res.users').create(
-            cr, uid, self.user_data(cr, uid, context), context)
+            cr, uid, self.user_data(cr, uid, new_id, context), context)
     
-    def action_new(self, cr, uid, ids, context=None):
-        self.create_user(cr, uid, context=context)
+    def action_next(self, cr, uid, ids, context=None):
+        self.create_user(cr, uid, ids[0], context=context)
         return {
             'view_type': 'form',
             "view_mode": 'form',

From b2a428c701140a355ba1c89fa492ffab3fa06e76 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 10 Dec 2009 08:32:13 +0100
Subject: [PATCH 21/48] [IMP] provide hook methods for extensions orthogonal to
 the event handlers themselves

bzr revid: xmo@tinyerp.com-20091210073213-4wpiu60tr6ap8lco
---
 bin/addons/base/res/res_config.py | 16 +++++++++++++++-
 bin/addons/base/res/res_user.py   |  5 ++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 9902d3de890..36f44a674c2 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -80,7 +80,21 @@ class res_config_configurable(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
     def next(self, cr, uid, *args, **kwargs):
         return self._next(cr, uid)
-    def action_skip(self, cr, uid, *args, **kwargs):
+
+    def execute(self, cr, uid, ids, context=None):
+        raise NotImplementedError(
+            'Configuration items need to implement execute')
+    def cancel(self, cr, uid, ids, context=None):
+        pass
+
+    def action_next(self, cr, uid, ids, context=None):
+        next = self.execute(cr, uid, ids, context=None)
+        if next: return next
+        return self._next(cr, uid)
+        
+    def action_skip(self, cr, uid, ids, context=None):
+        next = self.cancel(cr, uid, ids, context=None)
+        if next: return next
         return self._next(cr, uid)
 res_config_configurable()
 
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 94cdc227545..376985b120f 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -270,7 +270,7 @@ class config_users(osv.osv_memory):
         self.pool.get('res.users').create(
             cr, uid, self.user_data(cr, uid, new_id, context), context)
     
-    def action_next(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         self.create_user(cr, uid, ids[0], context=context)
         return {
             'view_type': 'form',
@@ -301,7 +301,7 @@ class res_config_view(osv.osv_memory):
         'view':lambda *args: 'simple',
     }
 
-    def action_next(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         res=self.read(cr,uid,ids)[0]
         users_obj = self.pool.get('res.users')
         group_obj=self.pool.get('res.groups')
@@ -311,7 +311,6 @@ class res_config_view(osv.osv_memory):
                 users_obj.write(cr, uid, [uid],{
                                 'groups_id':[(4,group_ids[0])]
                             }, context=context)
-        return self.next(cr, uid)
 res_config_view()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ec6ac388a09b341349186f884811a344bd3a72ba Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 10 Dec 2009 08:34:13 +0100
Subject: [PATCH 22/48] [IMP] bit of docstring

bzr revid: xmo@tinyerp.com-20091210073413-cr4ixklvwahkhy7y
---
 bin/addons/base/res/res_config.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 36f44a674c2..3281fc472a7 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -23,6 +23,12 @@ from osv import osv, fields
 import netsvc
 
 class res_config_configurable(osv.osv_memory):
+    ''' Base classes for new-style configuration items
+
+    Configuration items should inherit from this class, implement
+    the execute method (and optionally the cancel one) and have
+    their view inherit from the related res_config_view_base view.
+    '''
     _name = 'res.config'
     logger = netsvc.Logger()
 

From a636a7ab0a57e32951812cfc74106d6f522c82fc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 10 Dec 2009 09:06:50 +0100
Subject: [PATCH 23/48] [imp] implement a complete next() method and use it in
 action_next and action_skip, make it part of res.config's official API

bzr revid: xmo@tinyerp.com-20091210080650-1gp80tjpepz4wee2
---
 bin/addons/base/res/res_config.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 3281fc472a7..68d24866a93 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -84,7 +84,7 @@ class res_config_configurable(osv.osv_memory):
             'actions', netsvc.LOG_INFO,
             'all configuration actions have been executed')
         return {'type': 'ir.actions.act_window_close'}
-    def next(self, cr, uid, *args, **kwargs):
+    def next(self, cr, uid, ids, context=None):
         return self._next(cr, uid)
 
     def execute(self, cr, uid, ids, context=None):
@@ -96,12 +96,12 @@ class res_config_configurable(osv.osv_memory):
     def action_next(self, cr, uid, ids, context=None):
         next = self.execute(cr, uid, ids, context=None)
         if next: return next
-        return self._next(cr, uid)
-        
+        return self.next(cr, uid, ids, context=context)
+
     def action_skip(self, cr, uid, ids, context=None):
         next = self.cancel(cr, uid, ids, context=None)
         if next: return next
-        return self._next(cr, uid)
+        return self.next(cr, uid, ids, context=context)
 res_config_configurable()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 503695e4e55ecb52252d2fbe89ba2d184c2b66de Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 10 Dec 2009 11:30:43 +0100
Subject: [PATCH 24/48] [fix] forgot to apply the expanded set of args in
 next() to the action_server

bzr revid: xmo@tinyerp.com-20091210103043-i8pck9jonbjmomp9
---
 bin/addons/base/ir/ir.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 4dad43cb66c..062d563a15b 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1411,7 +1411,7 @@
           <field name="name">Start Configuration</field>
           <field name="model_id" ref="model_res_config"/>
           <field name="state">code</field>
-          <field name="code">action = self.next(cr, uid)</field>
+          <field name="code">action = self.next(cr, uid, [])</field>
         </record>
         <menuitem action="action_start_configurator" id="menu_configurator_module" parent="next_id_11" type="server"/>
     </data>

From a0a6b7df535fd9593b9cbf0c5fca6d285ce5fc6d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 10 Dec 2009 14:22:11 +0100
Subject: [PATCH 25/48] [imp] remove apparently unused ir_model_config

bzr revid: xmo@tinyerp.com-20091210132211-7kr2lari765mhdly
---
 bin/addons/base/ir/ir_model.py               | 34 --------------------
 bin/addons/base/security/ir.model.access.csv |  2 --
 2 files changed, 36 deletions(-)

diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index c5361fd952d..99444bd475d 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -610,38 +610,4 @@ class ir_model_data(osv.osv):
         return True
 ir_model_data()
 
-class ir_model_config(osv.osv):
-    _name = 'ir.model.config'
-    _columns = {
-        'password': fields.char('Password', size=64),
-        'password_check': fields.char('Confirmation', size=64),
-    }
-
-    def action_cancel(self, cr, uid, ids, context={}):
-        return {
-            'view_type': 'form',
-            "view_mode": 'form',
-            'res_model': 'ir.actions.configuration.wizard',
-            'type': 'ir.actions.act_window',
-            'target':'new',
-        }
-
-    def action_update_pw(self, cr, uid, ids, context={}):
-        res = self.read(cr,uid,ids)[0]
-        root = self.pool.get('res.users').browse(cr, uid, [1])[0]
-        self.unlink(cr, uid, [res['id']])
-        if res['password']!=res['password_check']:
-            raise except_orm(_('Error'), _("Password mismatch !"))
-        elif not res['password']:
-            raise except_orm(_('Error'), _("Password empty !"))
-        self.pool.get('res.users').write(cr, uid, [root.id], {'password':res['password']})
-        return {
-            'view_type': 'form',
-            "view_mode": 'form',
-            'res_model': 'ir.actions.configuration.wizard',
-            'type': 'ir.actions.act_window',
-            'target':'new',
-        }
-ir_model_config()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index a3e7c63c095..ec61d4f854b 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -8,13 +8,11 @@
 "access_ir_model_group_erp_manager","ir_model group_erp_manager","model_ir_model","group_erp_manager",1,1,1,1
 "access_ir_model_access_group_erp_manager","ir_model_access_group_erp_manager","model_ir_model_access","group_erp_manager",1,1,1,1
 "access_ir_model_grid_group_erp_manager","ir_model_access_grid_group_erp_manager","model_ir_model_grid","group_erp_manager",1,1,1,1
-"access_ir_model_config_group_erp_manager","ir_model_config group_erp_manager","model_ir_model_config","group_erp_manager",1,1,1,1
 "access_ir_model_data_group_erp_manager","ir_model_data group_erp_manager","model_ir_model_data","group_erp_manager",1,1,1,1
 "access_ir_model_fields_group_erp_manager","ir_model_fields group_erp_manager","model_ir_model_fields","group_erp_manager",1,1,1,1
 "access_ir_model_all","ir_model_all","model_ir_model",,1,0,0,0
 "access_ir_model_access_all","ir_model_access_all","model_ir_model_access",,1,0,0,0
 "access_ir_model_grid_all","ir_model_access_grid_all","model_ir_model_grid",,0,0,0,0
-"access_ir_model_config_all","ir_model_config_all","model_ir_model_config",,1,0,0,0
 "access_ir_model_data_all","ir_model_data all","model_ir_model_data",,1,0,0,0
 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0
 "access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category","group_system",1,0,0,0

From f32bc4e6cf591ba560e6bd0ecdd4300f463685e9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 10 Dec 2009 14:47:36 +0100
Subject: [PATCH 26/48] [rem] remove ir_actions_configuration_wizard

bzr revid: xmo@tinyerp.com-20091210134736-ackpf4bj6nu5eruf
---
 bin/addons/base/ir/ir.xml                     |  32 ------
 bin/addons/base/ir/ir_actions.py              | 100 ------------------
 .../module/wizard/wizard_module_upgrade.py    |  18 +---
 bin/addons/base/security/ir.model.access.csv  |   1 -
 4 files changed, 4 insertions(+), 147 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 919404d97e9..38fb06a30a1 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1384,38 +1384,6 @@
         <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="1"/>
         <menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form" parent="next_id_11"/>
 
-        <record id="view_config_wizard_form" model="ir.ui.view">
-            <field name="name">Main Configuration Wizard</field>
-            <field name="model">ir.actions.configuration.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Next Configuration Step">
-                    <image name="gtk-dialog-info"/>
-                    <group>
-                        <separator string="Next Configuration Step" colspan="4"/>
-                        <field name="name" nolabel="1" colspan="4" width="500"/>
-                        <field name="progress" widget="progressbar"/>
-                        <separator colspan="4" string=""/>
-                        <label string="" colspan="2"/>
-                        <group colspan="2" col="2">
-                            <button icon="gtk-cancel" name="button_skip" string="Skip Step" type="object"/>
-                            <button icon="gtk-go-forward" name="button_continue" string="Continue" type="object"/>
-                        </group>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_config_wizard_form" model="ir.actions.act_window">
-            <field name="name">Configuration Wizard</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">ir.actions.configuration.wizard</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-        <menuitem action="action_config_wizard_form" id="menu_config_module" parent="base.next_id_11"/>
-
         <record id="action_start_configurator" model="ir.actions.server">
           <field name="name">Start Configuration</field>
           <field name="model_id" ref="model_res_config"/>
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index ec4825172e1..e2090d497de 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -701,105 +701,5 @@ class ir_actions_todo(osv.osv):
     _order="sequence"
 ir_actions_todo()
 
-# This model to use run all configuration actions
-class ir_actions_configuration_wizard(osv.osv_memory):
-    _name='ir.actions.configuration.wizard'
-    def next_configuration_action(self,cr,uid,context={}):
-        item_obj = self.pool.get('ir.actions.todo')
-        item_ids = item_obj.search(cr, uid, [('state','=','open'),
-                                             ('active','=',True)],
-                                   limit=1, context=context)
-        if item_ids:
-            return item_obj.browse(cr, uid, item_ids[0], context=context)
-        return False
-    def _get_action_name(self, cr, uid, context={}):
-        next_action = self.next_configuration_action(cr,uid,context=context)
-        if next_action:
-            return next_action.note
-        else:
-            return "Your database is now fully configured.\n\nClick 'Continue' and enjoy your OpenERP experience..."
-
-    def _get_action(self, cr, uid, context={}):
-        next_action = self.next_configuration_action(cr, uid, context=context)
-        if next_action:
-            return next_action.id
-        return
-
-    def _progress_get(self, cr, uid, context=None):
-        total = self.pool.get('ir.actions.todo')\
-            .search_count(cr, uid, [], context)
-        todo = self.pool.get('ir.actions.todo')\
-            .search_count(cr, uid,[('active','=',True),
-                                   ('state','<>','open')],
-                          context)
-        if total > 0.0:
-            return max(5.0, round(todo*100/total))
-        else:
-            return 100.0
-
-    _columns = {
-        'name': fields.text('Next Wizard', readonly=True),
-        'progress': fields.float('Configuration Progress', readonly=True),
-        'item_id': fields.many2one('ir.actions.todo',
-                                  'Next Configuration Wizard',
-                                  invisible=True, readonly=True),
-    }
-    _defaults={
-        'progress': _progress_get,
-        'item_id': _get_action,
-        'name': _get_action_name,
-    }
-    def button_next(self,cr,uid,ids,context=None):
-        user_action = self.pool.get('res.users').browse(cr,uid,uid)
-        act_obj = self.pool.get(user_action.menu_id.type)
-        action_ids = act_obj.search(cr,uid,[
-                ('name', '=', user_action.menu_id.name)])
-        action_open = act_obj.browse(cr, uid, action_ids)[0]
-        if context and 'menu' in context:
-            return {
-                'view_type': action_open.view_type,
-                'view_id': action_open.view_id and [action_open.view_id.id] or False,
-                'res_model': action_open.res_model,
-                'type': action_open.type,
-                'domain': action_open.domain
-            }
-        return {'type': 'ir.actions.act_window_close'}
-
-    def button_skip(self,cr,uid,ids,context=None):
-        item_obj = self.pool.get('ir.actions.todo')
-        item_id = self.read(cr,uid,ids)[0]['item_id']
-        if item_id:
-            item = item_obj.browse(cr, uid, item_id, context=context)
-            item_obj.write(cr, uid, item.id, {
-                'state': 'skip',
-                }, context=context)
-            return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-            }
-        return self.button_next(cr, uid, ids, context)
-
-    def button_continue(self, cr, uid, ids, context=None):
-        item_obj = self.pool.get('ir.actions.todo')
-        item_id = self.read(cr,uid,ids)[0]['item_id']
-        if item_id:
-            item = item_obj.browse(cr, uid, item_id, context=context)
-            item_obj.write(cr, uid, item.id, {
-                'state': 'done',
-                }, context=context)
-            return {
-                  'view_mode': item.action_id.view_mode,
-                  'view_type': item.action_id.view_type,
-                  'view_id':item.action_id.view_id and [item.action_id.view_id.id] or False,
-                  'res_model': item.action_id.res_model,
-                  'type': item.action_id.type,
-                  'target':item.action_id.target,
-            }
-        return self.button_next(cr, uid, ids, context)
-ir_actions_configuration_wizard()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/bin/addons/base/module/wizard/wizard_module_upgrade.py b/bin/addons/base/module/wizard/wizard_module_upgrade.py
index 051d6ca00c4..40d100fe2e0 100644
--- a/bin/addons/base/module/wizard/wizard_module_upgrade.py
+++ b/bin/addons/base/module/wizard/wizard_module_upgrade.py
@@ -92,13 +92,8 @@ class wizard_info_get(wizard.interface):
         return {}
 
     def _config(self, cr, uid, data, context=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
+        return pooler.get_pool(cr.dbname).get('res.config')\
+            .next(cr, uid, [], context=context)
 
     states = {
         'init': {
@@ -183,13 +178,8 @@ class wizard_info_get_simple(wizard.interface):
         return {}
 
     def _config(self, cr, uid, data, context=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
+        return pooler.get_pool(cr.dbname).get('res.config')\
+            .next(cr, uid, [], context=context)
 
     states = {
         'init': {
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index ec61d4f854b..73fabdfa27f 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -97,7 +97,6 @@
 "access_ir_actions_wizard_all","ir_actions_wizard","model_ir_actions_wizard",,1,0,0,0
 "access_ir_actions_wizard_group_system","ir_actions_wizard_group_system","model_ir_actions_wizard","group_system",1,1,1,1
 "access_ir_actions_todo_group_system","ir_actions_todo group system","model_ir_actions_todo","group_system",1,1,1,1
-"access_ir_actions_config_wiz_group_system","ir_actions_configuration_wizard group system","model_ir_actions_configuration_wizard","group_system",1,1,1,1
 "access_workflow_all","workflow_all","model_workflow",,1,0,0,0
 "access_workflow_group_system","workflow_group_system","model_workflow","group_system",1,1,1,1
 "access_workflow_activity_all","workflow_activity_all","model_workflow_activity",,1,0,0,0

From d29ee0fda2a718fa31b7c5a728da87ba427518e3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 10 Dec 2009 14:57:41 +0100
Subject: [PATCH 27/48] [add] access rights for res.config and res.config.users

bzr revid: xmo@tinyerp.com-20091210135741-8t856cu9eerg8pl3
---
 bin/addons/base/security/ir.model.access.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 73fabdfa27f..75825719a5c 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -44,6 +44,8 @@
 "access_wizard_module_lang_export_group_system","wizard_module_lang_export group_system","model_wizard_module_lang_export","group_system",1,1,1,1
 "access_res_company_group_erp_manager","res_company group_erp_manager","model_res_company","group_erp_manager",1,1,1,1
 "access_res_company_group_user","res_company group_user","model_res_company",,1,0,0,0
+"access_res_config_all","res_config all","model_res_config",,1,0,0,0
+"access_res_config_users_all","res_config_users all","model_res_config_users",,1,0,0,0
 "access_res_country_group_all","res_country group_user_all","model_res_country",,1,0,0,0
 "access_res_country_state_group_all","res_country_state group_user_all","model_res_country_state",,1,0,0,0
 "access_res_country_group_user","res_country group_user","model_res_country","group_partner_manager",1,1,1,1

From 1a4464c65a1813c8e235c3430b80977c2d32656c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 17:14:49 +0100
Subject: [PATCH 28/48] [imp] Change default label of res.config view to Next

bzr revid: xmo@tinyerp.com-20091215161449-l9rhmrim8x5e1bet
---
 bin/addons/base/res/res_config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index b193dae39c8..8cdb96b04ac 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -15,7 +15,7 @@
             <button name="action_skip" icon="gtk-cancel" special="cancel"
                     type="object" string="Skip"/>
             <button name="action_next" icon="gtk-ok"
-                    type="object" string="Record"/>
+                    type="object" string="Next"/>
           </group>
         </form>
       </field>

From 342182d6cfbc057a2db6696babcdcba2643cbbdd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 17:22:58 +0100
Subject: [PATCH 29/48] [imp] Change default icons on res.config view buttons

bzr revid: xmo@tinyerp.com-20091215162258-xsh9fvq9p76evqh3
---
 bin/addons/base/res/res_config.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 8cdb96b04ac..2f68bb577eb 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -12,9 +12,9 @@
           <field name="progress" widget="progressbar" nolabel="1" colspan="1"/>
           <label string="" colspan="1"/>
           <group colspan="2" col="4">
-            <button name="action_skip" icon="gtk-cancel" special="cancel"
+            <button name="action_skip" icon="gtk-goto-last" special="cancel"
                     type="object" string="Skip"/>
-            <button name="action_next" icon="gtk-ok"
+            <button name="action_next" icon="gtk-go-forward"
                     type="object" string="Next"/>
           </group>
         </form>

From 58456c7ec43fcd3995d3023d96361836380e7abf Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 15 Dec 2009 17:24:02 +0100
Subject: [PATCH 30/48] [imp] re-enable label on progress bar in
 res.config.view.base

bzr revid: xmo@tinyerp.com-20091215162402-7rftvme23np5gkge
---
 bin/addons/base/res/res_config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 2f68bb577eb..a1d36d387bc 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -9,7 +9,7 @@
           <group string="res_config_contents">
           </group>
           <separator string="" colspan="4"/>
-          <field name="progress" widget="progressbar" nolabel="1" colspan="1"/>
+          <field name="progress" widget="progressbar" colspan="1"/>
           <label string="" colspan="1"/>
           <group colspan="2" col="4">
             <button name="action_skip" icon="gtk-goto-last" special="cancel"

From edfa7c95e1a6f658667e9c59adc5acb2c4b74c9e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 16 Dec 2009 08:50:38 +0100
Subject: [PATCH 31/48] [fix] formatting of the new wizard buttons

* Shouldn't be dependent by the formatting of the working group
* Shouldn't be broken when removing e.g. the Skip button

bzr revid: xmo@tinyerp.com-20091216075038-40lpufgkq4w5puzw
---
 bin/addons/base/res/res_config.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index a1d36d387bc..acf7102b95e 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -9,13 +9,17 @@
           <group string="res_config_contents">
           </group>
           <separator string="" colspan="4"/>
-          <field name="progress" widget="progressbar" colspan="1"/>
-          <label string="" colspan="1"/>
-          <group colspan="2" col="4">
-            <button name="action_skip" icon="gtk-goto-last" special="cancel"
-                    type="object" string="Skip"/>
-            <button name="action_next" icon="gtk-go-forward"
-                    type="object" string="Next"/>
+          <group colspan="4" col="8">
+            <field name="progress" widget="progressbar"/>
+            <label string="" colspan="3"/>
+            <group colspan="1" col="2">
+              <button name="action_skip" icon="gtk-goto-last" special="cancel"
+                      type="object" string="Skip"/>
+            </group>
+            <group colspan="1" col="2">
+              <button name="action_next" icon="gtk-go-forward"
+                      type="object" string="Next"/>
+            </group>
           </group>
         </form>
       </field>

From 22ddcd11103f510f500085348f4164a57153bd03 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 16 Dec 2009 12:57:48 +0100
Subject: [PATCH 32/48] [imp] move sequence to first column in listing of todos

bzr revid: xmo@tinyerp.com-20091216115748-0rv457vg21b198xq
---
 bin/addons/base/ir/ir.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 38fb06a30a1..b327cf71d67 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1355,8 +1355,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Config Wizard Steps">
-                    <field name="action_id" select="1"/>
                     <field name="sequence"/>
+                    <field name="action_id" select="1"/>
                     <field name="state"/>
                     <field name="active" select="1"/>
                 </tree>

From 18c7c954d30fcc65b633bea9b67124d801036b32 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 16 Dec 2009 13:14:41 +0100
Subject: [PATCH 33/48] [imp] move ir.actions.todo#active to select=2

bzr revid: xmo@tinyerp.com-20091216121441-1y7esy6ebw7d83vl
---
 bin/addons/base/ir/ir.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index b327cf71d67..0b9e0e08208 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1358,7 +1358,7 @@
                     <field name="sequence"/>
                     <field name="action_id" select="1"/>
                     <field name="state"/>
-                    <field name="active" select="1"/>
+                    <field name="active" select="2"/>
                 </tree>
             </field>
         </record>
@@ -1368,10 +1368,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form editable="bottom" string="Config Wizard Steps">
-                    <field name="action_id" select="1"/>
                     <field name="sequence"/>
+                    <field name="action_id" select="1"/>
                     <field name="state"/>
-                    <field name="active" select="1"/>
+                    <field name="active" select="2"/>
                 </form>
             </field>
         </record>

From d93aa372fd068ca19d41f4c3e46a357a5eef9c49 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 16 Dec 2009 14:33:35 +0100
Subject: [PATCH 34/48] =?UTF-8?q?[imp]=20when=20configuration=20is=20done,?=
 =?UTF-8?q?=20switch=20to=20current=20user=20menu=20view=20instead=20of=20?=
 =?UTF-8?q?closing=20current=20window=E2=80=A6=20maybe=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: xmo@tinyerp.com-20091216133335-a33n1jobttujuq53
---
 bin/addons/base/res/res_config.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 68d24866a93..5bb0c555b3b 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -83,7 +83,12 @@ class res_config_configurable(osv.osv_memory):
         self.logger.notifyChannel(
             'actions', netsvc.LOG_INFO,
             'all configuration actions have been executed')
-        return {'type': 'ir.actions.act_window_close'}
+
+        current_user_menu = self.pool.get('res.users')\
+            .browse(cr, uid, uid).menu_id
+        # return the action associated with the menu
+        return self.pool.get(current_user_menu.type)\
+            .read(cr, uid, current_user_menu.id)
     def next(self, cr, uid, ids, context=None):
         return self._next(cr, uid)
 

From a3a7bb50bc595c148593d0cf7f0a050332e94201 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Wed, 16 Dec 2009 16:59:41 +0100
Subject: [PATCH 35/48] [imp] add compatibility ir.actions.configuration.wizard
 for plugins which have yet to migrate to res.config

bzr revid: xmo@tinyerp.com-20091216155941-vfzrtkpr0yestddb
---
 bin/addons/base/ir/ir_actions.py             |  4 ++-
 bin/addons/base/res/res_config.py            | 31 ++++++++++++++++++++
 bin/addons/base/res/res_config.xml           | 23 +++++++++++++++
 bin/addons/base/security/ir.model.access.csv |  1 +
 4 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index e2090d497de..c850a363217 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -691,7 +691,9 @@ class ir_actions_todo(osv.osv):
             ondelete='cascade'),
         'sequence': fields.integer('Sequence'),
         'active': fields.boolean('Active'),
-        'state': fields.selection(TODO_STATES, string='State', required=True)
+        'state': fields.selection(TODO_STATES, string='State', required=True),
+        'name':fields.char('Name', size=64),
+        'note':fields.text('Text', translate=True),
     }
     _defaults={
         'state': lambda *a: 'open',
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 5bb0c555b3b..595d72732e4 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -109,4 +109,35 @@ class res_config_configurable(osv.osv_memory):
         return self.next(cr, uid, ids, context=context)
 res_config_configurable()
 
+class ir_actions_configuration_wizard(osv.osv_memory):
+    ''' Compatibility configuration wizard
+
+    The old configuration wizard has been replaced by res.config, but in order
+    not to break existing but not-yet-migrated addons, the old wizard was
+    reintegrated and gutted.
+    '''
+    _name='ir.actions.configuration.wizard'
+    _inherit = 'res.config'
+
+    def _next_action_note(self, cr, uid, ids, context=None):
+        next = self._next_action(cr, uid)
+        if next:
+            return next.note
+        return "Your database is now fully configured.\n\n"\
+            "Click 'Continue' and enjoy your OpenERP experience..."
+
+    _columns = {
+        'note': fields.text('Next Wizard', readonly=True),
+        }
+    _defaults = {
+        'note': _next_action_note,
+        }
+
+    def execute(self, cr, uid, ids, context=None):
+        self.logger.notifyChannel(
+            'configuration', netsvc.LOG_WARNING,
+            'Addon using old-style configuration wizard, please migrate to '\
+                'res.config objects')
+ir_actions_configuration_wizard()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index acf7102b95e..2b1d3b45d42 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -24,5 +24,28 @@
         </form>
       </field>
     </record>
+
+    <record id="view_config_wizard_form" model="ir.ui.view">
+      <field name="name">Compabitiliby configuration wizard</field>
+      <field name="model">ir.actions.configuration.wizard</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Next Configuration Step">
+          <image name="gtk-dialog-info"/>
+          <group>
+            <field name="note" nolabel="1" colspan="4" width="500"/>
+            <group colspan="4" col="8">
+              <field name="progress" widget="progressbar"/>
+              <label string="" colspan="4"/>
+              <group colspan="1" col="2">
+                <button name="action_next" icon="gtk-go-forward"
+                        type="object" string="Continue"/>
+              </group>
+            </group>
+          </group>
+        </form>
+      </field>
+    </record>
+
   </data>
 </openerp>
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 75825719a5c..2373ef2d581 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -99,6 +99,7 @@
 "access_ir_actions_wizard_all","ir_actions_wizard","model_ir_actions_wizard",,1,0,0,0
 "access_ir_actions_wizard_group_system","ir_actions_wizard_group_system","model_ir_actions_wizard","group_system",1,1,1,1
 "access_ir_actions_todo_group_system","ir_actions_todo group system","model_ir_actions_todo","group_system",1,1,1,1
+"access_ir_actions_config_wiz_group_system","ir_actions_configuration_wizard group system","model_ir_actions_configuration_wizard","group_system",1,1,1,1
 "access_workflow_all","workflow_all","model_workflow",,1,0,0,0
 "access_workflow_group_system","workflow_group_system","model_workflow","group_system",1,1,1,1
 "access_workflow_activity_all","workflow_activity_all","model_workflow_activity",,1,0,0,0

From 2151d2808a21d483e57d92be5467a89283b2f9fa Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 17 Dec 2009 15:19:14 +0100
Subject: [PATCH 36/48] [fix] add default note if we have new-style config
 items following old-style ones

bzr revid: xmo@tinyerp.com-20091217141914-dc0i3l1j7b92oe01
---
 bin/addons/base/res/res_config.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 595d72732e4..52096575272 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -122,7 +122,10 @@ class ir_actions_configuration_wizard(osv.osv_memory):
     def _next_action_note(self, cr, uid, ids, context=None):
         next = self._next_action(cr, uid)
         if next:
-            return next.note
+            # if the next one is also an old-style extension, you never know...
+            if next.note:
+                return next.note
+            return "Click 'Continue' to configure the next addon..."
         return "Your database is now fully configured.\n\n"\
             "Click 'Continue' and enjoy your OpenERP experience..."
 

From bbb9d6bab1bec299e30ac78e4a9d936628179f5d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 17 Dec 2009 15:19:35 +0100
Subject: [PATCH 37/48] [imp] improve deprecation warning message

bzr revid: xmo@tinyerp.com-20091217141935-f6rdzkkjsmcu234s
---
 bin/addons/base/res/res_config.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index 52096575272..0060de4e1d1 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -109,6 +109,10 @@ class res_config_configurable(osv.osv_memory):
         return self.next(cr, uid, ids, context=context)
 res_config_configurable()
 
+DEPRECATION_MESSAGE = 'You are using an addon using old-style configuration '\
+    'wizards (ir.actions.configuration.wizard). Old-style configuration '\
+    'wizards have been deprecated.\n'\
+    'The addon should be migrated to res.config objects.'
 class ir_actions_configuration_wizard(osv.osv_memory):
     ''' Compatibility configuration wizard
 
@@ -138,9 +142,8 @@ class ir_actions_configuration_wizard(osv.osv_memory):
 
     def execute(self, cr, uid, ids, context=None):
         self.logger.notifyChannel(
-            'configuration', netsvc.LOG_WARNING,
-            'Addon using old-style configuration wizard, please migrate to '\
-                'res.config objects')
+            'configuration', netsvc.LOG_WARNING, DEPRECATION_MESSAGE)
+
 ir_actions_configuration_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ea45f7a98c4d848e241fc0c64e0358cf768ba682 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 17 Dec 2009 16:30:08 +0100
Subject: [PATCH 38/48] [imp] interface of initial view type configuration

bzr revid: xmo@tinyerp.com-20091217153008-ufhe2lren1j9keo1
---
 bin/addons/base/base_update.xml | 18 ++++++++++++------
 bin/addons/base/res/res_user.py |  4 +++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 93bb0676e8c..e1102ddf100 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -269,13 +269,19 @@
 
                 <group string="res_config_contents" position="replace">
                   <label colspan="4" align="0.0" string='
-                    Choose between the simplified interface and the extended one.
-                    If you are testing or using OpenERP for the first time, we suggest you use
-                    the simplified interface, which has less options and fields but is easier to
-                    understand. You will be able to switch to the extended view later.
+                    Choose between the simplified interface and the extended
+                    one.'/>
+                  <newline/>
+                  <label colspan="4" align="0.0" string='
+                    If you are testing OpenERP or using it for the first time,
+                    we suggest you use the simplified interface. It has less
+                    options and fields but is easier to understand.'/>
+                  <newline/>
+                  <label colspan="4" align="0.0" string='
+                    You will be able to switch to the extended interface later.
                     '/>
-                  <separator string="Choose Your Mode" colspan="4"/>
-                  <field colspan="2" name="view"/>
+                  <separator string="Choose Your Interface" colspan="4"/>
+                  <field colspan="2" name="view" nolabel="1"/>
                 </group>
                 <xpath expr='//button[@name="action_skip"]' position='replace'/>
                 <xpath expr='//button[@name="action_next"]' position='attributes'>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index df8c031f029..93d21028385 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -303,7 +303,9 @@ class res_config_view(osv.osv_memory):
     _inherit = 'res.config'
     _columns = {
         'name':fields.char('Name', size=64),
-        'view': fields.selection([('simple','Simplified Interface'),('extended','Extended Interface')], 'View Mode', required=True ),
+        'view': fields.selection([('simple','Simplified'),
+                                  ('extended','Extended')],
+                                 'Interface', required=True ),
     }
     _defaults={
         'view':lambda *args: 'simple',

From 50d288840773f296991a639d79d59a8253ef24fa Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 17 Dec 2009 17:07:38 +0100
Subject: [PATCH 39/48] [imp] simplify user creation view

bzr revid: xmo@tinyerp.com-20091217160738-z3p9sc9s1v7yhj4h
---
 bin/addons/base/base_update.xml | 52 +++++++++++++++------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index e1102ddf100..df92e3a2c55 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -209,38 +209,34 @@
                 </form>
 
                 <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0"
-                         string='You will be able to assign groups to users.
-                    Groups define the access rights of each users on the
-                    different objects of the system.'/>
-                  <separator string="Define New Users" colspan="4"/>
-                  <field name="name" select="1"/>
-                  <field name="active" select="1"/>
+                  <separator string="New User" colspan="4"/>
+                  <field name="name" select="1" colspan="4"/>
                   <field name="login" select="1"/>
                   <field name="password" password="True"/>
-                  <notebook colspan="4">
-                    <page string="User">
-                      <field name="address_id"/>
-                      <field name="company_id" required="1"/>
-                      <field name="action_id" required="True"/>
-                      <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
-                      <field name="context_lang"/>
-                      <field name="context_tz"/>
-                      <field colspan="4" name="signature"/>
-                    </page>
-                    <page string="Groups">
-                      <label string="Groups are used to defined access rights on each screen and menu." align="0.0" colspan="4"/>
-                      <field colspan="4" nolabel="1" name="groups_id"/>
-                    </page>
-                    <page string="Roles">
-                      <label string="Roles are used to defined available actions, provided by workflows." align="0.0" colspan="4"/>
-                      <field colspan="4" nolabel="1" name="roles_id"/>
-                    </page>
-                  </notebook>
+                  <field name="context_lang"/>
+                  <field name="context_tz"/>
+                  <field colspan="4" name="signature"/>
+
+                  <separator string="Group" colspan="4"/>
+                  <label  align="0.0" colspan="4" string="
+                    Groups are used to define access rights on objects and
+                    the visibility of screens and menus"/>
+                  <field colspan="4" nolabel="1" name="groups_id"/>
+
+                  <separator string="Roles" colspan="4"/>
+                  <label align="0.0" colspan="4" string="
+                    Roles restrict the workflow actions visible to the user."/>
+                  <field colspan="4" nolabel="1" name="roles_id"/>
                 </group>
-                
-                <xpath expr='//button[@name="action_next"]' position='attributes'>
+                <xpath expr='//button[@name="action_skip"]'
+                       position='attributes'>
+                  <attribute name='string'>Next</attribute>
+                  <attribute name='icon'>gtk-go-forward</attribute>
+                </xpath>
+                <xpath expr='//button[@name="action_next"]'
+                       position='attributes'>
                   <attribute name='string'>Add User</attribute>
+                  <attribute name='icon'>gtk-add</attribute>
                 </xpath>
               </data>
             </field>

From ef21375efa4e51e3801838df83682dabc597b664 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 17 Dec 2009 17:16:42 +0100
Subject: [PATCH 40/48] [imp] use *args in defaults lambdas

bzr revid: xmo@tinyerp.com-20091217161642-h83r8m6ici45aifv
---
 bin/addons/base/res/res_user.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 93d21028385..dd438a019f4 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -187,9 +187,9 @@ class users(osv.osv):
         return ids or False
 
     _defaults = {
-        'password' : lambda obj,cr,uid,context={} : '',
+        'password' : lambda *a : '',
         'context_lang': lambda *args: 'en_US',
-        'active' : lambda obj,cr,uid,context={} : True,
+        'active' : lambda *a: True,
         'menu_id': _get_menu,
         'action_id': _get_menu,
         'company_id': _get_company,

From 175fcd7b185836b302d9b73748eb215941ac36b2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 17 Dec 2009 17:19:57 +0100
Subject: [PATCH 41/48] [add] email field to the user profile

bzr revid: xmo@tinyerp.com-20091217161957-mpfs3ztvto1nfnv3
---
 bin/addons/base/base_update.xml | 3 ++-
 bin/addons/base/res/res_user.py | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index df92e3a2c55..66258f2038e 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -210,7 +210,8 @@
 
                 <group string="res_config_contents" position="replace">
                   <separator string="New User" colspan="4"/>
-                  <field name="name" select="1" colspan="4"/>
+                  <field name="name" select="1"/>
+                  <field name="email"/>
                   <field name="login" select="1"/>
                   <field name="password" password="True"/>
                   <field name="context_lang"/>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index dd438a019f4..d3f932d3307 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -131,6 +131,8 @@ class users(osv.osv):
         'name': fields.char('Name', size=64, required=True, select=True),
         'login': fields.char('Login', size=64, required=True),
         'password': fields.char('Password', size=64, invisible=True, help="Keep empty if you don't want the user to be able to connect on the system."),
+        'email': fields.char('E-mail', size=64, help='If an email is provided'\
+                             ', the user will be sent a message welcoming him'),
         'signature': fields.text('Signature', size=64),
         'address_id': fields.many2one('res.partner.address', 'Address'),
         'active': fields.boolean('Active'),

From 327387ee6dd97bd561df23ffe8609d80220bc321 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 17 Dec 2009 17:20:35 +0100
Subject: [PATCH 42/48] [rem] select=1 attributes on user creation form

bzr revid: xmo@tinyerp.com-20091217162035-ylsrf1w24tf8vyod
---
 bin/addons/base/base_update.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 66258f2038e..7db6c794045 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -210,9 +210,9 @@
 
                 <group string="res_config_contents" position="replace">
                   <separator string="New User" colspan="4"/>
-                  <field name="name" select="1"/>
+                  <field name="name"/>
                   <field name="email"/>
-                  <field name="login" select="1"/>
+                  <field name="login"/>
                   <field name="password" password="True"/>
                   <field name="context_lang"/>
                   <field name="context_tz"/>

From 714e56e5e710274e217a7132bee4578456e485e9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 17 Dec 2009 18:09:05 +0100
Subject: [PATCH 43/48] [add] autogenerate signature on user creation form

bzr revid: xmo@tinyerp.com-20091217170905-q194aey4efi9wkpd
---
 bin/addons/base/base_update.xml | 13 ++++++++++---
 bin/addons/base/res/res_user.py | 28 ++++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 7db6c794045..d7d0ab4b518 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -210,13 +210,20 @@
 
                 <group string="res_config_contents" position="replace">
                   <separator string="New User" colspan="4"/>
-                  <field name="name"/>
-                  <field name="email"/>
+                  <field name="previous_signature" invisible="1"/>
+                  <field name="name"
+                         on_change="generate_signature(name, email,
+                                    previous_signature, signature)"/>
+                  <field name="email"
+                         on_change="generate_signature(name, email,
+                                    previous_signature, signature)"/>
                   <field name="login"/>
                   <field name="password" password="True"/>
                   <field name="context_lang"/>
                   <field name="context_tz"/>
-                  <field colspan="4" name="signature"/>
+                  <field colspan="4" name="signature"
+                         on_change="generate_signature(name, email,
+                                    previous_signature, signature)"/>
 
                   <separator string="Group" colspan="4"/>
                   <label  align="0.0" colspan="4" string="
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d3f932d3307..faaf8cd3401 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -259,11 +259,17 @@ class users(osv.osv):
     ]
 users()
 
+SIGNATURE_FORMAT = '''--
+%(name)s %(email)s
+'''
 class config_users(osv.osv_memory):
     _name = 'res.config.users'
     _inherit = 'res.config'
 
-    _columns = users._columns
+    _columns = dict(
+        users._columns,
+        previous_signature=fields.text(),
+        )
     _defaults = users._defaults
 
     def user_data(self, cr, uid, new_id, context=None):
@@ -279,7 +285,25 @@ class config_users(osv.osv_memory):
         '''
         self.pool.get('res.users').create(
             cr, uid, self.user_data(cr, uid, new_id, context), context)
-    
+
+    def generate_signature(self, cr, uid, ids, name, email,
+                           previous_signature, signature, context=None):
+        ''' If the admin sets the name or email, regenerate the signature
+        except if the admin has previously edited the signature manually,
+        in this case stop generating the signature unless the admin completely
+        empties the custom sig.
+        '''
+        if signature != previous_signature:
+            return {'value': {'previous_signature':''}}
+        signature =  SIGNATURE_FORMAT % {
+            'name': name or '',
+            'email': email and ' <'+email+'>' or '',
+            }
+        return {'value': {
+                'previous_signature': signature,
+                'signature': signature,
+                }}
+
     def execute(self, cr, uid, ids, context=None):
         self.create_user(cr, uid, ids[0], context=context)
         return {

From 5cba98ef43d85c6ea7f4e87b06650c8c97df00c6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 17 Dec 2009 20:34:37 +0100
Subject: [PATCH 44/48] [fix] menuitem doesn't use action/field[@name='name']
 as its title when @type='service'

bzr revid: xmo@tinyerp.com-20091217193437-xu89dpp7htm2v637
---
 bin/addons/base/ir/ir.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 0b9e0e08208..280ce093dbf 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1390,6 +1390,8 @@
           <field name="state">code</field>
           <field name="code">action = self.next(cr, uid, [])</field>
         </record>
-        <menuitem action="action_start_configurator" id="menu_configurator_module" parent="next_id_11" type="server"/>
+        <menuitem action="action_start_configurator" name="Start Configuration"
+                  id="menu_configurator_module" parent="next_id_11"
+                  type="server"/>
     </data>
 </openerp>

From 4730f553f9649abe44fc3ef65186c4abf3333f2c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 17 Dec 2009 20:42:50 +0100
Subject: [PATCH 45/48] [fix] address generation & use brand new multiple
 inheritance & cross osv/osv_memory instead of _columns hack

bzr revid: xmo@tinyerp.com-20091217194250-cvta8ckyuqslv3qm
---
 bin/addons/base/base_update.xml        | 12 +-----
 bin/addons/base/res/partner/partner.py | 10 ++++-
 bin/addons/base/res/res_user.py        | 56 ++++++++++----------------
 3 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index d7d0ab4b518..e0421aaab0d 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -210,20 +210,12 @@
 
                 <group string="res_config_contents" position="replace">
                   <separator string="New User" colspan="4"/>
-                  <field name="previous_signature" invisible="1"/>
-                  <field name="name"
-                         on_change="generate_signature(name, email,
-                                    previous_signature, signature)"/>
-                  <field name="email"
-                         on_change="generate_signature(name, email,
-                                    previous_signature, signature)"/>
+                  <field name="name"/>
+                  <field name="email"/>
                   <field name="login"/>
                   <field name="password" password="True"/>
                   <field name="context_lang"/>
                   <field name="context_tz"/>
-                  <field colspan="4" name="signature"
-                         on_change="generate_signature(name, email,
-                                    previous_signature, signature)"/>
 
                   <separator string="Group" colspan="4"/>
                   <label  align="0.0" colspan="4" string="
diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 99fd490a27f..8d53a8588d2 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -271,7 +271,15 @@ class res_partner(osv.osv):
         if (not context.get('category_id', False)):
             return False
         return _('Partners: ')+self.pool.get('res.partner.category').browse(cr, uid, context['category_id'], context).name
-
+    def main_partner(self, cr, uid):
+        ''' Return the id of the main partner
+        '''
+        model_data = self.pool.get('ir.model.data')
+        return model_data.browse(
+            cr, uid,
+            model_data.search(cr, uid, [('module','=','base'),
+                                        ('name','=','main_partner')])[0],
+            ).res_id
 res_partner()
 
 class res_partner_address(osv.osv):
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index faaf8cd3401..5ca1f2c8d5c 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -196,6 +196,7 @@ class users(osv.osv):
         'action_id': _get_menu,
         'company_id': _get_company,
         'groups_id': _get_group,
+        'address_id': False,
     }
     def company_get(self, cr, uid, uid2):
         company_id = self.pool.get('res.users').browse(cr, uid, uid2).company_id.id
@@ -259,50 +260,35 @@ class users(osv.osv):
     ]
 users()
 
-SIGNATURE_FORMAT = '''--
-%(name)s %(email)s
-'''
 class config_users(osv.osv_memory):
     _name = 'res.config.users'
-    _inherit = 'res.config'
+    _inherit = ['res.users', 'res.config']
 
-    _columns = dict(
-        users._columns,
-        previous_signature=fields.text(),
-        )
-    _defaults = users._defaults
+    def _generate_signature(self, cr, name, email, context=None):
+        return _('--\n%(name)s %(email)s\n') % {
+            'name': name or '',
+            'email': email and ' <'+email+'>' or '',
+            }
 
-    def user_data(self, cr, uid, new_id, context=None):
-        ''' Gets the purely user part of the current config_user
-        instance, without the fields inherited from res.config
-        '''
-        return self.read(cr, uid, new_id,
-                         users._columns.keys(),
-                         context=context)
     def create_user(self, cr, uid, new_id, context=None):
         ''' create a new res.user instance from the data stored
         in the current res.config.users
         '''
+        base_data = self.read(cr, uid, new_id, context=context)
+        partner_id = self.pool.get('res.partner').main_partner(cr, uid)
+        address = self.pool.get('res.partner.address').create(
+            cr, uid, {'name': base_data['name'],
+                      'email': base_data['email'],
+                      'partner_id': partner_id,},
+            context)
+        user_data = dict(
+            user_data,
+            signature=self._generate_signature(
+                cr, base_data['name'], base_data['email'], context=context),
+            address_id=address,
+            )
         self.pool.get('res.users').create(
-            cr, uid, self.user_data(cr, uid, new_id, context), context)
-
-    def generate_signature(self, cr, uid, ids, name, email,
-                           previous_signature, signature, context=None):
-        ''' If the admin sets the name or email, regenerate the signature
-        except if the admin has previously edited the signature manually,
-        in this case stop generating the signature unless the admin completely
-        empties the custom sig.
-        '''
-        if signature != previous_signature:
-            return {'value': {'previous_signature':''}}
-        signature =  SIGNATURE_FORMAT % {
-            'name': name or '',
-            'email': email and ' <'+email+'>' or '',
-            }
-        return {'value': {
-                'previous_signature': signature,
-                'signature': signature,
-                }}
+            cr, uid, user_data, context)
 
     def execute(self, cr, uid, ids, context=None):
         self.create_user(cr, uid, ids[0], context=context)

From feca699a8e7acebc742e3e27ad5020ae3bd69fe7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 17 Dec 2009 20:47:16 +0100
Subject: [PATCH 46/48] [fix] forgot one variable rename

bzr revid: xmo@tinyerp.com-20091217194716-2o1kf961ed6667xp
---
 bin/addons/base/res/res_user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 5ca1f2c8d5c..40be4a43392 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -282,7 +282,7 @@ class config_users(osv.osv_memory):
                       'partner_id': partner_id,},
             context)
         user_data = dict(
-            user_data,
+            base_data,
             signature=self._generate_signature(
                 cr, base_data['name'], base_data['email'], context=context),
             address_id=address,

From 5e38a8fb7c6d8117a63997bfeb76386378c4816a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Fri, 18 Dec 2009 10:37:36 +0100
Subject: [PATCH 47/48] [imp] remove roles listing from user creation config
 item

bzr revid: xmo@tinyerp.com-20091218093736-z8hba6dwxyx77k3v
---
 bin/addons/base/base_update.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index e0421aaab0d..a3bc710e857 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -222,12 +222,8 @@
                     Groups are used to define access rights on objects and
                     the visibility of screens and menus"/>
                   <field colspan="4" nolabel="1" name="groups_id"/>
-
-                  <separator string="Roles" colspan="4"/>
-                  <label align="0.0" colspan="4" string="
-                    Roles restrict the workflow actions visible to the user."/>
-                  <field colspan="4" nolabel="1" name="roles_id"/>
                 </group>
+
                 <xpath expr='//button[@name="action_skip"]'
                        position='attributes'>
                   <attribute name='string'>Next</attribute>

From ebde69da5c8ab73a6a11c93c0045f87cdfc8bce2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Tue, 5 Jan 2010 20:25:44 +0100
Subject: [PATCH 48/48] [fix] create email column of res_users in base.sql or a
 race condition is generated

bzr revid: xmo@tinyerp.com-20100105192544-7rgsimlzjtkwm9j5
---
 bin/addons/base/base.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql
index 58b30a89cf2..ccdfc3847a2 100644
--- a/bin/addons/base/base.sql
+++ b/bin/addons/base/base.sql
@@ -141,6 +141,7 @@ CREATE TABLE res_users (
     active boolean default True,
     login varchar(64) NOT NULL UNIQUE,
     password varchar(64) default null,
+    email varchar(64) default null,
     context_tz varchar(64) default null,
     signature text,
 --  action_id int references ir_act_window on delete set null,