Merge lp:~openerp-dev/openobject-addons/6.1-opw-578178-msh into lp:openobject-addons/6.1

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of crm action, here act_email_cc is retrieved from obj on which the action is defined but act_email_cc is the field of base_action_rule so it should be retrieved from action, and also checked whether act_mail_to_watchers is checked or not, if checked then and then only truncate the email_cc of action.

Demo :- Create an automated action on crm.helpdesk when state is going to pending.
Now go to any new record of crm.helpdesk and put it in to pending you will get traceback that act_email_cc is not in browse_record.

Reason :- act_email_cc is the field of action(nase_action_rule, action is the browse object of base_action and obj is the object of object on which action is defined.), so if act_mail_to_watchers is checked then truncate email_cc + act_email_cc otherwise only email_cc.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not Relevant on Trunk (means that architecture on trunk has changed and so this bug has no meaning anymore). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6957. By Mohammed Shekha(Open ERP) on 2012-08-21

[FIX]Fixed the issue of crm action, here act_email_cc is retrieved from obj on which the action is defined but act_email_cc is the field of base_action_rule so it should be retrieved from action, and also checked whether act_mail_to_watchers is checked or not, if checked then and then only truncate the email_cc of action.

=== modified file 'crm/crm_action_rule.py'
--- crm/crm_action_rule.py	2012-03-16 14:42:51 +0000
+++ crm/crm_action_rule.py	2012-08-21 10:20:40 +0000
@@ -97,12 +97,12 @@
             write['section_id'] = action.act_section_id.id
 
         if hasattr(obj, 'email_cc') and action.act_email_cc:
-            if '@' in (obj.email_cc or ''):
+            if '@' in (obj.email_cc or '') and action.act_mail_to_watchers:
                 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'] = obj.email_cc
 
         # Put state change by rule in communication history
         if hasattr(obj, 'state') and hasattr(obj, 'message_append') and action.act_state: