From a069671a8aacdad098a635c39c10c5481a4ab397 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Mon, 26 Jul 2010 16:29:49 +0530 Subject: [PATCH] [FIX]: crm: Name in domain for base_action_rule bzr revid: rpa@tinyerp.com-20100726105949-fop8p9d2vdq6iwef --- addons/base_action_rule/base_action_rule.py | 2 ++ addons/crm/crm.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index df57bc86ce8..a80297e2b94 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -282,6 +282,8 @@ the rule to mark CC(mail to any other person defined in actions)."), ok = ok and (not action.trg_state_from or action.trg_state_from==obj.state) if state_to: ok = ok and (not action.trg_state_to or action.trg_state_to==state_to) + elif action.trg_state_to: + ok = False reg_name = action.regex_name result_name = True if reg_name: diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 478cd7b2986..2db380f1c93 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -429,7 +429,7 @@ class crm_case(object): rule_obj = self.pool.get('base.action.rule') model_obj = self.pool.get('ir.model') model_ids = model_obj.search(cr, uid, [('model','=',self._name)]) - rule_ids = rule_obj.search(cr, uid, [('name','=',model_ids[0])]) + rule_ids = rule_obj.search(cr, uid, [('model_id','=',model_ids[0])]) return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context) def format_body(self, body):