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

[FIX] crm: adapt overridden method of base_action_rule 

bzr revid: rco@openerp.com-20121220162615-zerev9bxpcqxtip1
This commit is contained in:
Raphael Collet 2012-12-20 17:26:15 +01:00
parent 5301d15429
commit b2864c4feb
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/base_action_rule/base_action_rule.py
View File

@ -144,10 +144,10 @@ class base_action_rule(osv.osv):
# modify records
values = {}
if action.act_user_id and 'user_id' in model._all_columns:
values['user_id'] = action.act_user_id.id
if 'date_action_last' in model._all_columns:
values['date_action_last'] = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
if action.act_user_id and 'user_id' in model._all_columns:
values['user_id'] = action.act_user_id.id
if action.act_state and 'state' in model._all_columns:
values['state'] = action.act_state

25
addons/crm/crm_action_rule.py
View File

@ -39,17 +39,20 @@ class base_action_rule(osv.osv):
'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'),
}
def do_action(self, cr, uid, action, obj, context=None):
res = super(base_action_rule, self).do_action(cr, uid, action, obj, context=context)
model_obj = self.pool.get(action.model_id.model)
write = {}
if hasattr(action, 'act_section_id') and action.act_section_id:
write['section_id'] = action.act_section_id.id
def _process(self, cr, uid, action, record_ids, context=None):
""" process the given action on the records """
res = super(base_action_rule, self)._process(cr, uid, action, record_ids, context=context)
if hasattr(action, 'act_categ_id') and action.act_categ_id:
write['categ_ids'] = [(4, action.act_categ_id.id)]
# add record modifications
context = dict(context or {}, action=True)
model = self.pool.get(action.model_id.model)
values = {}
if action.act_section_id and 'section_id' in model._all_columns:
values['section_id'] = action.act_section_id.id
if action.act_categ_id and 'categ_ids' in model._all_columns:
values['categ_ids'] = [(4, action.act_categ_id.id)]
model.write(cr, uid, record_ids, values, context=context)
model_obj.write(cr, uid, [obj.id], write, context)
return res
def state_get(self, cr, uid, context=None):
@ -57,8 +60,4 @@ class base_action_rule(osv.osv):
res = super(base_action_rule, self).state_get(cr, uid, context=context)
return res + crm.AVAILABLE_STATES
def priority_get(self, cr, uid, context=None):
res = super(base_action_rule, self).priority_get(cr, uid, context=context)
return res + crm.AVAILABLE_PRIORITIES
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: