[MERGE] OPW 267641: crm/crm_action_rule: mail action are not sent to both action and current watchers

bzr revid: xal@openerp.com-20120828083602-q0hk043oc9ur2i5k
This commit is contained in:
Xavier ALT
2012-08-28 10:36:02 +02:00
+3 -3
View File
@@ -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: