[IMP] rename state 'cancel' to 'hidden'
bzr revid: xmo@openerp.com-20110718093926-jnfcij9270e4hvml
This commit is contained in:
parent
956abff97b
commit
6577f5a733
|
@ -818,7 +818,7 @@ ir_actions_todo_category()
|
||||||
# This model use to register action services.
|
# This model use to register action services.
|
||||||
TODO_STATES = [('open', 'To Do'),
|
TODO_STATES = [('open', 'To Do'),
|
||||||
('done', 'Done'),
|
('done', 'Done'),
|
||||||
('cancel', 'Cancelled')]
|
('hidden', 'Hidden')]
|
||||||
TODO_TYPES = [('special', 'Special'),
|
TODO_TYPES = [('special', 'Special'),
|
||||||
('normal', 'Normal'),
|
('normal', 'Normal'),
|
||||||
('recurring', 'Recurring')]
|
('recurring', 'Recurring')]
|
||||||
|
|
|
@ -173,7 +173,7 @@ class res_config_configurable(osv.osv_memory):
|
||||||
an action dictionary -- executes the action provided by calling
|
an action dictionary -- executes the action provided by calling
|
||||||
``next``.
|
``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)
|
next = self.cancel(cr, uid, ids, context=None)
|
||||||
if next: return next
|
if next: return next
|
||||||
return self.next(cr, uid, ids, context=context)
|
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
|
an action dictionary -- executes the action provided by calling
|
||||||
``next``.
|
``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)
|
next = self.cancel(cr, uid, ids, context=None)
|
||||||
if next: return next
|
if next: return next
|
||||||
return self.next(cr, uid, ids, context=context)
|
return self.next(cr, uid, ids, context=context)
|
||||||
|
|
Loading…
Reference in New Issue