[MERGE] ir.actions.todo documentation

bzr revid: qdp-launchpad@openerp.com-20110704100807-qi5qs7pmrk4j1yrt

diff --cc openerp/addons/base/ir/ir_actions.py
index 0b4ab79,bb8f319..245aeba
--- 1/openerp/addons/base/ir/ir_actions.py
--- 2/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@@ -824,7 -833,9 +833,9 @@@ class ir_actions_todo(osv.osv)
          'sequence': fields.integer('Sequence'),
          'state': fields.selection(TODO_STATES, string='State', required=True),
          'name':fields.char('Name', size=64),
-         'type': fields.selection([('special','Special'),('normal','Normal'),('normal_recurring','Normal Recurring')],'Type',required=True),
+         'type': fields.selection([('special','Special'),('normal','Normal'),('normal_recurring','Normal Recurring')], 'Type', required=True, help="Special: that have to be run again on trigger (when someone select this application to be reconfigured)\
 -\nNormal: that will be display in the config panel and disappear as soon it's done\
++\nNormal: that will be displayed in the config panel and disappear as soon it's done\
+ \nNormal Recurring: that will be always displayed in the config panel regardless of it's state"),
          'groups_id':fields.many2many('res.groups', 'res_groups_action_rel', 'uid', 'gid', 'Groups'),
          'note':fields.text('Text', translate=True),
          'category_id': fields.many2one('ir.actions.todo.category','Category'),