diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-05-07 18:00:23 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-05-07 18:00:23 +0200 |
| commit | 1091b24a0c659e6e7ad3ca0d6ba7141617ddcb4c (patch) | |
| tree | 142b61f0833a0224dec04d3ee5f6c03c44304001 /addons/mail/mail_thread.py | |
| parent | 643871c20f096223b38ef69e846dcaa9f1e44051 (diff) | |
| parent | 1953aa442fb2f6cc4d0e64bbfcc1f9a461f14a02 (diff) | |
[MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
Diffstat (limited to 'addons/mail/mail_thread.py')
| -rw-r--r-- | addons/mail/mail_thread.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 112dff6bac6..d2dcef4d85e 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -434,14 +434,14 @@ class mail_thread(osv.AbstractModel): fol_obj.unlink(cr, SUPERUSER_ID, fol_ids, context=context) return res - def copy(self, cr, uid, id, default=None, context=None): + def copy_data(self, cr, uid, id, default=None, context=None): # avoid tracking multiple temporary changes during copy context = dict(context or {}, mail_notrack=True) default = default or {} default['message_ids'] = [] default['message_follower_ids'] = [] - return super(mail_thread, self).copy(cr, uid, id, default=default, context=context) + return super(mail_thread, self).copy_data(cr, uid, id, default=default, context=context) #------------------------------------------------------ # Automatically log tracked fields |
