Merge lp:~openerp-dev/openobject-addons/6.0-opw-574487-msh into lp:openobject-addons/6.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of duplicated emails in object from email action, as well as changed the widget from url to email in Global CC of project.issue.

Demo :- Create an automated action say for example on project.issue which triggered when case is in progress state, now set email action and set Add Watcher(CC) field with some emails, now go to project.issue and create an issue with emails in Global CC, here if there is an email which is already in automated action then it will be duplcated in Global CC field when action is triggered.

Also In project Issue we have given a widget=url in Global CC, so changed it widget="email", widget=url will not work with web as web will validate the data as a url widget which is actually email.

Thanks.

[lp:~openerp-dev/openobject-addons/6.0-opw-574487-msh]

5224. By Mohammed Shekha(Open ERP) on 2012-05-11

[FIX]Refixed the iissue as obj.email_cc will not work, it will duplicate the emails, so changed the code, to remove duplication when user have used obj.email_cc in automated action.

Unmerged revisions

5224. By Mohammed Shekha(Open ERP) on 2012-05-11

[FIX]Refixed the iissue as obj.email_cc will not work, it will duplicate the emails, so changed the code, to remove duplication when user have used obj.email_cc in automated action.

=== modified file 'crm/crm_action_rule.py'
--- crm/crm_action_rule.py	2012-02-21 09:22:24 +0000
+++ crm/crm_action_rule.py	2012-05-11 05:33:19 +0000
@@ -115,12 +115,16 @@
             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 (action.act_email_cc or '') and action.act_mail_to_watchers:
                 emails = obj.email_cc.split(",")
-                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
+                emails = [email.strip() for email in emails]
+                action_email_cc = [eval(email).strip() for email in action.act_email_cc.split(',')]
+                uniqueEmail = [email for index, email in enumerate(action_email_cc) if email not in emails]
+                uniqueEmail.extend(emails)
+                writeMail = ','.join(uniqueEmail)
+                write['email_cc'] = writeMail
             else:
-                write['email_cc'] = action.act_email_cc
+                write['email_cc'] = obj.email_cc
 
         # Put state change by rule in communication history
         if hasattr(obj, 'state') and action.act_state:

=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml	2011-08-19 10:47:35 +0000
+++ project_issue/project_issue_view.xml	2012-05-11 05:33:19 +0000
@@ -95,7 +95,7 @@
                         </page>
                         <page string="Communication &amp; History" groups="base.group_extended">
                             <group colspan="4">
-                            <field colspan="4" name="email_cc" string="Global CC" widget="url"/>
+                            <field colspan="4" name="email_cc" string="Global CC" widget="email"/>
                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                                 <tree string="History">