pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REM] pre-check that we're not setting ir_actions_todo.state to nothing: it's a selection field, so the write call can check that itself

Browse Source 
bzr revid: xmo@openerp.com-20101108104718-md2wdklz5rc92ef5
This commit is contained in:
Xavier Morel
2010-11-08 11:47:18 +01:00
parent 89af2f0c8e
commit bf35164a65
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/res/res_config.py
+3 -14
View File
@@ -97,8 +97,6 @@ class res_config_configurable(osv.osv_memory):
if not previous_todo:
self.__logger.warn(_("Couldn't find previous ir.actions.todo"))
return
if not state:
raise ValueError(_("Can't set an ir.actions.todo's state to an empty value."))
previous_todo.write({'state':state})
def _next(self, cr, uid, context=None):
@@ -169,10 +167,7 @@ class res_config_configurable(osv.osv_memory):
an action dictionary -- executes the action provided by calling
``next``.
"""
try:
self._set_previous_todo(cr, uid, state='done', context=context)
except Exception, e:
raise osv.except_osv(_('Error'), e.message)
self._set_previous_todo(cr, uid, state='done', context=context)
next = self.execute(cr, uid, ids, context=None)
if next: return next
return self.next(cr, uid, ids, context=context)
@@ -185,10 +180,7 @@ class res_config_configurable(osv.osv_memory):
an action dictionary -- executes the action provided by calling
``next``.
"""
try:
self._set_previous_todo(cr, uid, state='skip', context=context)
except Exception, e:
raise osv.except_osv(_('Error'), e.message)
self._set_previous_todo(cr, uid, state='skip', context=context)
next = self.cancel(cr, uid, ids, context=None)
if next: return next
return self.next(cr, uid, ids, context=context)
@@ -204,10 +196,7 @@ class res_config_configurable(osv.osv_memory):
an action dictionary -- executes the action provided by calling
``next``.
"""
try:
self._set_previous_todo(cr, uid, state='cancel', context=context)
except Exception, e:
raise osv.except_osv(_('Error'), e.message)
self._set_previous_todo(cr, uid, state='cancel', context=context)
next = self.cancel(cr, uid, ids, context=None)
if next: return next
return self.next(cr, uid, ids, context=context)