diff --git a/app_common/__manifest__.py b/app_common/__manifest__.py index 041bbe02..632ff4a7 100644 --- a/app_common/__manifest__.py +++ b/app_common/__manifest__.py @@ -39,7 +39,7 @@ { 'name': "odooAi Common Util and Tools", - 'version': '24.04.18', + 'version': '24.04.29', 'author': 'odooai.cn', 'category': 'Base', 'website': 'https://www.odooai.cn', diff --git a/app_common/models/ir_mail_server.py b/app_common/models/ir_mail_server.py index 4bff8a61..2321f0d0 100644 --- a/app_common/models/ir_mail_server.py +++ b/app_common/models/ir_mail_server.py @@ -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) diff --git a/app_common/models/mail_mail.py b/app_common/models/mail_mail.py index 801cac5c..1783926c 100644 --- a/app_common/models/mail_mail.py +++ b/app_common/models/mail_mail.py @@ -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) diff --git a/app_common/static/description/index.html b/app_common/static/description/index.html index 8b3162f9..ff947c17 100644 --- a/app_common/static/description/index.html +++ b/app_common/static/description/index.html @@ -4,7 +4,7 @@

odooAi Common Util and Tools

Network and media and base tools

-

Lastest update: v17.24.03.29

+

Lastest update: v17.24.04.29