[FIX] OPW 267641: crm/crm_action_rule: mail action are not sent to both action and...

  forward port of v6.0 revid: nel@tinyerp.com-20120220115804-e2dw9nq60r0gbchg

bzr revid: xal@openerp.com-20120828074139-mp1xxsbl1ngyoyp8

diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index ec489ff..787dce2 100644 (file)
--- 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: