[FIX] mail: only set header value for emails (not comments)

2017-08-22 13:32:34 +02:00
parent c023e1d562
commit 902fc764d5
1 changed files with 2 additions and 2 deletions
@@ -294,11 +294,11 @@ class MailComposer(models.TransientModel):
                'no_auto_thread': self.no_auto_thread,
                'mail_server_id': self.mail_server_id.id,
            }
-            if self.model in self.env and hasattr(self.env[self.model], 'message_get_email_values'):
-                mail_values.update(self.env[self.model].browse(res_id).message_get_email_values())

            # mass mailing: rendering override wizard static values
            if mass_mail_mode and self.model:
+                if self.model in self.env and hasattr(self.env[self.model], 'message_get_email_values'):
+                    mail_values.update(self.env[self.model].browse(res_id).message_get_email_values())
                # keep a copy unless specifically requested, reset record name (avoid browsing records)
                mail_values.update(notification=not self.auto_delete_message, model=self.model, res_id=res_id, record_name=False)
                # auto deletion of mail_mail