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

Merge PR #431 into 11.0 

Signed-off-by pedrobaeza
pull/434/head
OCA-git-bot 2019-08-27 11:50:44 +00:00
parent 6e3bd38227 84ccae5190
commit 272c5956a8
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail_tracking/__manifest__.py
View File

@ -5,7 +5,7 @@
{
"name": "Email tracking",
"summary": "Email tracking system for all mails sent",
"version": "11.0.2.1.0",
"version": "11.0.2.1.1",
"category": "Social Network",
"website": "http://github.com/OCA/social",
"author": "Tecnativa, "

4
mail_tracking/i18n/mail_tracking.pot
View File

@ -54,8 +54,8 @@ msgid "Bounced"
msgstr ""
#. module: mail_tracking
#: code:addons/mail_tracking/models/mail_thread.py:39
#: code:addons/mail_tracking/models/mail_thread.py:43
#: code:addons/mail_tracking/models/mail_thread.py:44
#: code:addons/mail_tracking/models/mail_thread.py:48
#: model:ir.model.fields,field_description:mail_tracking.field_mail_compose_message_email_cc
#: model:ir.model.fields,field_description:mail_tracking.field_mail_message_email_cc
#, python-format

9
mail_tracking/models/mail_thread.py
View File

@ -11,8 +11,13 @@ class MailThread(models.AbstractModel):
@api.multi
@api.returns('self', lambda value: value.id)
def message_post(self, **kwargs):
new_message = super().message_post(**kwargs)
def message_post(self, body='', subject=None, message_type='notification',
subtype=None, parent_id=False, attachments=None,
content_subtype='html', **kwargs):
new_message = super().message_post(
body=body, subject=subject, message_type=message_type,
subtype=subtype, parent_id=parent_id, attachments=attachments,
content_subtype=content_subtype, **kwargs)
email_cc = kwargs.get('cc')
if email_cc:
new_message.sudo().write({