vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[hot] [fix] Add X-Original-From header when replacing sender

Browse source
This commit is contained in:
Anand Doshi 2016-04-20 19:38:54 +05:30
parent 1e854f1ef0
commit e8879454e8
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/email/email_body.py
View file

@ -176,6 +176,7 @@ class EMail:
def replace_sender(self):
if cint(self.email_account.always_use_account_email_id_as_sender):
self.original_sender = self.sender
sender_name, sender_email = email.utils.parseaddr(self.sender)
self.sender = email.utils.formataddr((sender_name or self.email_account.name, self.email_account.email_id))
@ -198,6 +199,9 @@ class EMail:
b'X-Frappe-Site': get_url().encode('utf-8'),
}
if cint(self.email_account.always_use_account_email_id_as_sender) and hasattr(self, 'original_sender'):
headers[b'X-Original-From'] = self.original_sender.encode('utf-8')
# reset headers as values may be changed.
for key, val in headers.iteritems():
if self.msg_root.has_key(key):