[MERGE] rpa's branch

bzr revid: qdp-launchpad@openerp.com-20110427152504-2fsgwoa1lo7e5i6i

openerp/addons/base/module/wizard/base_module_shortcut_data.xml

@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
-            <field name="name">Reconfigure</field>
+            <field name="name">Add More Features</field>
             <field name="resource">ir.ui.menu</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="res_id" ref="menu_view_base_module_configuration"/>

openerp/addons/base/res/res_config.py

@@ -77,7 +77,12 @@ class res_config_configurable(osv.osv_memory):
                 cr.execute("select 1 from res_groups_users_rel where uid=%s and gid IN %s",(uid, tuple(todo_groups),))
                 dont_skip_todo = bool(cr.fetchone())
             if dont_skip_todo:
-                return todos.browse(cr, uid, active_todos[0], context=None)
+                res = todos.browse(cr, uid, active_todos[0], context=None)
+                # Wizards that directly opens a form stays in Todo state even if its called, 
+                # as next_action is not called,  so, setting state as done 'manually' 
+                if res.action_id.target == 'current':
+                    res.write({'state': 'done'})
+                return res
             else:
                 todos.write(cr, uid, active_todos[0], {'state':'skip'}, context=None)
                 return self._next_action(cr, uid)