From 578596299d3139007bf130e4d7610424fcd3d10c Mon Sep 17 00:00:00 2001 From: Xavier ALT Date: Tue, 28 Aug 2012 09:41:39 +0200 Subject: [PATCH] [FIX] OPW 267641: crm/crm_action_rule: mail action are not sent to both action and current watchers forward port of v6.0 revid: nel@tinyerp.com-20120220115804-e2dw9nq60r0gbchg bzr revid: xal@openerp.com-20120828074139-mp1xxsbl1ngyoyp8 --- addons/crm/crm_action_rule.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index ec489ff4d14..787dce2edc4 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -99,10 +99,10 @@ class base_action_rule(osv.osv): if hasattr(obj, 'email_cc') and action.act_email_cc: if '@' in (obj.email_cc or ''): emails = obj.email_cc.split(",") - if obj.act_email_cc not in emails:# and '<'+str(action.act_email_cc)+">" not in emails: - write['email_cc'] = obj.email_cc + ',' + obj.act_email_cc + if action.act_email_cc not in emails:# and '<'+str(action.act_email_cc)+">" not in emails: + write['email_cc'] = obj.email_cc+','+action.act_email_cc else: - write['email_cc'] = obj.act_email_cc + write['email_cc'] = action.act_email_cc # Put state change by rule in communication history if hasattr(obj, 'state') and hasattr(obj, 'message_append') and action.act_state: