odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] rename state 'cancel' to 'hidden' 

bzr revid: xmo@openerp.com-20110718093926-jnfcij9270e4hvml
This commit is contained in:
Xavier Morel 2011-07-18 11:39:26 +02:00
parent 956abff97b
commit 6577f5a733
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/addons/base/ir/ir_actions.py
View File

@ -818,7 +818,7 @@ ir_actions_todo_category()
# This model use to register action services.
TODO_STATES = [('open', 'To Do'),
('done', 'Done'),
('cancel', 'Cancelled')]
('hidden', 'Hidden')]
TODO_TYPES = [('special', 'Special'),
('normal', 'Normal'),
('recurring', 'Recurring')]

4
openerp/addons/base/res/res_config.py
View File

@ -173,7 +173,7 @@ class res_config_configurable(osv.osv_memory):
an action dictionary -- executes the action provided by calling
``next``.
"""
self._set_previous_todo(cr, uid, state='skip', context=context)
self._set_previous_todo(cr, uid, state='done', context=context)
next = self.cancel(cr, uid, ids, context=None)
if next: return next
return self.next(cr, uid, ids, context=context)
@ -189,7 +189,7 @@ class res_config_configurable(osv.osv_memory):
an action dictionary -- executes the action provided by calling
``next``.
"""
self._set_previous_todo(cr, uid, state='cancel', context=context)
self._set_previous_todo(cr, uid, state='hidden', context=context)
next = self.cancel(cr, uid, ids, context=None)
if next: return next
return self.next(cr, uid, ids, context=context)