[MERGE]: Merge work of aag for new proposed changes for field restart (WORK IN PROGRESS)

bzr revid: rpa@tinyerp.com-20110411122509-wxuavchvlcm73fsu

diff --cc openerp/addons/base/ir/ir.xml
index d1917a4,c8bbd13..171d516
--- 1/openerp/addons/base/ir/ir.xml
--- 2/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@@ -1908,10 -1908,10 +1908,10 @@@
              <field name="type">search</field>
              <field name="arch" type="xml">
                  <search string="Search Actions">
-                     <filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('restart','=','on_trigger')]" help="Todo State Or (Skip State And ontrigger Restart)"/>
 -                    <filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('type','=','special')]" help="Todo State Or (Skip State And Special Type"/>
++                    <filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
                      <separator orientation="vertical"/>
                      <field name="state"/>
-                     <field name="restart"/>
+                     <field name="type"/>
                  </search>
              </field>
          </record>
@@@ -1925,7 -1925,7 +1925,7 @@@
          </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"
++        <menuitem action="act_ir_actions_ do_form" id="menu_ir_actions_todo_form"
                  parent="next_id_11" groups="base.group_extended" sequence="20"/>
  
  

diff --cc openerp/addons/base/ir/ir_actions.py
Simple merge

diff --cc openerp/addons/base/res/res_config.py
index e9d7867,7641526..75e42ef
--- 1/openerp/addons/base/res/res_config.py
--- 2/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@@ -66,6 -66,6 +66,7 @@@ class res_config_configurable(osv.osv_m
      def _next_action(self, cr, uid, context=None):
          todos = self.pool.get('ir.actions.todo')
          self.__logger.info('getting next %s', todos)
++        # Don't forget to change the domain in search view, if this condition is changed
          active_todos = todos.search(cr, uid, [('state','=','open')],
                                      limit=1)
          if active_todos: