diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-09-17 17:49:09 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-09-17 17:49:09 +0200 |
| commit | 080f8b1f96dec30fd9568a81342b5d20cc9d521a (patch) | |
| tree | 14cecabb2c6502e73d93178bd322722e2e62f07d /addons/mail/models | |
| parent | c12bd7125a1c64339e02ae0563f667b8de931b3b (diff) | |
| parent | d8ce75466e4a6728cccfc7696a65a399e9cf23f1 (diff) | |
[MERGE] forward port branch saas-12.3 up to d8ce75466e4
Diffstat (limited to 'addons/mail/models')
| -rw-r--r-- | addons/mail/models/mail_alias.py | 2 | ||||
| -rw-r--r-- | addons/mail/models/mail_message.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/models/mail_alias.py b/addons/mail/models/mail_alias.py index 0045ea87989..0a46837d7b2 100644 --- a/addons/mail/models/mail_alias.py +++ b/addons/mail/models/mail_alias.py @@ -249,7 +249,7 @@ class AliasMixin(models.AbstractModel): for record in child_model.search([('alias_id', '=', False)]): # create the alias, and link it to the current record alias = alias_model.create(record.get_alias_values()) - record.with_context({'mail_notrack': True}).alias_id = alias + record.with_context(mail_notrack=True).alias_id = alias _logger.info('Mail alias created for %s %s (id %s)', record._name, record.display_name, record.id) diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py index 41580a61a96..091fbcc0150 100644 --- a/addons/mail/models/mail_message.py +++ b/addons/mail/models/mail_message.py @@ -1014,7 +1014,7 @@ class Message(models.Model): def create(self, values): # coming from mail.js that does not have pid in its values if self.env.context.get('default_starred'): - self = self.with_context({'default_starred_partner_ids': [(4, self.env.user.partner_id.id)]}) + self = self.with_context(default_starred_partner_ids=[(4, self.env.user.partner_id.id)]) if 'email_from' not in values: # needed to compute reply_to values['email_from'] = self._get_default_from() |