Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/6.0-opw-267641-skh into lp:openobject-addons/6.0

  1. 6.0-opw-267641-skh
  2. Merge into 6.0
Proposed by Somesh Khare
Status: Merged
Approved by: Naresh(OpenERP)
Approved revision: no longer in the source branch.
Merge reported by: nel
Merged at revision: not available
Proposed branch: lp:~openerp-dev/openobject-addons/6.0-opw-267641-skh
Merge into: lp:openobject-addons/6.0
Diff against target: 17 lines (+3/-3)
1 file modified
crm/crm_action_rule.py (+3/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.0-opw-267641-skh
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+88484@code.launchpad.net

Description of the change

Hello,

[Fix] : This branch fixes the issue in the crm_action_rule.py, When you check the box for the "Add watchers" and provided watchers emails to it, Now change the state according to the Automated action on the object( Ex: Crm HelpDesk- Change the state from Draft to Open) , It generates a Error. The proposed merge resolve the issue.

Thanks,
Somesh Khare

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'crm/crm_action_rule.py'
2--- crm/crm_action_rule.py 2011-01-14 00:11:01 +0000
3+++ crm/crm_action_rule.py 2012-01-13 12:09:26 +0000
4@@ -117,10 +117,10 @@
5 if hasattr(obj, 'email_cc') and action.act_email_cc:
6 if '@' in (obj.email_cc or ''):
7 emails = obj.email_cc.split(",")
8- if obj.act_email_cc not in emails:# and '<'+str(action.act_email_cc)+">" not in emails:
9- write['email_cc'] = obj.email_cc+','+obj.act_email_cc
10+ if action.act_email_cc not in emails:# and '<'+str(action.act_email_cc)+">" not in emails:
11+ write['email_cc'] = obj.email_cc+','+action.act_email_cc
12 else:
13- write['email_cc'] = obj.act_email_cc
14+ write['email_cc'] = action.act_email_cc
15
16 # Put state change by rule in communication history
17 if hasattr(obj, 'state') and action.act_state: