audrius/app-odoo
1
0
Fork 0
mirror of https://github.com/guohuadeng/app-odoo.git synced 2025-02-23 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] app_common: Email Send error unexpected keyword argument 'alias_domain_id'

Browse Source
This commit is contained in:
Chill
2024-04-29 17:43:15 +08:00
parent a097c5aac3
commit 1d29bf000c
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app_common/models/ir_mail_server.py
View File

@@ -12,9 +12,9 @@ class IrMailServer(models.Model):
# 改默认发邮件逻辑
@api.model
def send_email(self, message, mail_server_id=None, smtp_server=None, smtp_port=None,
smtp_user=None, smtp_password=None, smtp_encryption=None, smtp_debug=False,
smtp_session=None):
smtp_user=None, smtp_password=None, smtp_encryption=None,
smtp_ssl_certificate=None, smtp_ssl_private_key=None,
smtp_debug=False, smtp_session=None):
email_to = message['To']
# 忽略掉无效email，避免被ban
@@ -26,5 +26,5 @@ class IrMailServer(models.Model):
raise AssertionError(_("Email to ignore: %s") % email_to)
return super(IrMailServer, self).send_email(message, mail_server_id, smtp_server, smtp_port,
smtp_user, smtp_password, smtp_encryption, smtp_debug,
smtp_session)
smtp_user, smtp_password, smtp_encryption, smtp_ssl_certificate, smtp_ssl_private_key,
smtp_debug, smtp_session)

4
app_common/models/mail_mail.py
View File

@@ -9,7 +9,7 @@ class MailMail(models.Model):
_inherit = "mail.mail"
# 猴子补丁模式，改默认发邮件逻辑
def _send(self, auto_commit=False, raise_exception=False, smtp_session=None):
def _send(self, auto_commit=False, raise_exception=False, smtp_session=None, alias_domain_id=False):
for m in self:
email_to = m.email_to
# 忽略掉无效email，避免被ban
@@ -21,4 +21,4 @@ class MailMail(models.Model):
self = self - m
if not self:
return True
return super(MailMail, self)._send(auto_commit, raise_exception, smtp_session)
return super(MailMail, self)._send(auto_commit, raise_exception, smtp_session, alias_domain_id)