Techsystech
/
social
mirror of https://github.com/OCA/social.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #557 into 12.0 

Signed-off-by pedrobaeza
pull/555/head
OCA-git-bot 2020-06-26 11:27:10 +00:00
parent 025852d996 50f0e6a41d
commit 3db3cf2658
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mail_tracking/models/ir_mail_server.py
View File

@ -80,9 +80,11 @@ class IrMailServer(models.Model):
except Exception as e: except Exception as e:
if tracking_email: if tracking_email:
tracking_email.smtp_error(self, smtp_server_used, e) tracking_email.smtp_error(self, smtp_server_used, e)
if message_id and tracking_email: raise
vals = tracking_email._tracking_sent_prepare( finally:
self, smtp_server_used, message, message_id) if message_id and tracking_email:
if vals: vals = tracking_email._tracking_sent_prepare(
self.env['mail.tracking.event'].sudo().create(vals) self, smtp_server_used, message, message_id)
if vals:
self.env['mail.tracking.event'].sudo().create(vals)
return message_id return message_id