From b491f6a7247c05cfb615acc3eb7b17935b40b2f0 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 3 Mar 2010 11:27:06 +0530 Subject: [PATCH] [IMP]: crm + base_action_rule: Added category in Rule action lp bug: https://launchpad.net/bugs/521865 fixed bzr revid: rpa@openerp.co.in-20100303055706-3rc0ap0q9u2nl2ry --- addons/base_action_rule/base_action_rule.py | 4 ++++ addons/crm/crm_action_rule.py | 1 + addons/crm/crm_action_rule_view.xml | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 0672b28ba33..020d2740d4d 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -126,6 +126,10 @@ class base_action_rule(osv.osv): obj.state = action.act_state write['state'] = action.act_state + if hasattr(obj, 'categ_id') and action.act_categ_id: + obj.categ_id = action.act_categ_id + write['categ_id'] = action.act_categ_id.id + if hasattr(obj, 'priority') and action.act_priority: obj.priority = action.act_priority write['priority'] = action.act_priority diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index c3184ea4097..1e7c50588db 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -188,6 +188,7 @@ class base_action_rule_line(osv.osv): 'trg_categ_id': fields.many2one('crm.case.categ', 'Category'), 'regex_history' : fields.char('Regular Expression on Case History', size=128), 'act_section_id': fields.many2one('crm.case.section', 'Set section to'), + 'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'), 'act_mail_to_partner': fields.boolean('Mail to partner',help="Check this if you want the rule to send an email to the partner."), } diff --git a/addons/crm/crm_action_rule_view.xml b/addons/crm/crm_action_rule_view.xml index 0cca1b22416..869100fdca6 100644 --- a/addons/crm/crm_action_rule_view.xml +++ b/addons/crm/crm_action_rule_view.xml @@ -36,7 +36,8 @@ form - + +