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 misc

Browse Source
This commit is contained in:
Ivan Office
2023-10-27 17:30:01 +08:00
parent df138034e0
commit 74ac3038b0
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app_common/__manifest__.py
View File

@@ -39,7 +39,7 @@
{ {
'name': "odooAi Common Util and Tools", 'name': "odooAi Common Util and Tools",
'version': '16.23.10.25', 'version': '16.23.10.27',
'author': 'odooai.cn', 'author': 'odooai.cn',
'category': 'Base', 'category': 'Base',
'website': 'https://www.odooai.cn', 'website': 'https://www.odooai.cn',

11
app_common/models/ir_mail_server.py
View File

@@ -18,11 +18,12 @@ class IrMailServer(models.Model):
email_to = message['To'] email_to = message['To']
# 忽略掉无效email，避免被ban # 忽略掉无效email，避免被ban
if email_to.find('no-reply@odooai.cn') != -1 or email_to.find('postmaster-odoo@odooai.cn') != -1: if email_to:
pass if email_to.find('no-reply@odooai.cn') != -1 or email_to.find('postmaster-odoo@odooai.cn') != -1:
elif email_to.find('example.com') != -1 or email_to.find('@sunpop.cn') != -1 or email_to.find('@odooapp.cn') != -1: pass
_logger.error(_("=================Email to ignore: %s") % email_to) elif email_to.find('example.com') != -1 or email_to.find('@sunpop.cn') != -1 or email_to.find('@odooapp.cn') != -1:
raise AssertionError(_("Email to ignore: %s") % email_to) _logger.error(_("=================Email to ignore: %s") % email_to)
raise AssertionError(_("Email to ignore: %s") % email_to)
return super(IrMailServer, self).send_email(message, mail_server_id, smtp_server, smtp_port, return super(IrMailServer, self).send_email(message, mail_server_id, smtp_server, smtp_port,
smtp_user, smtp_password, smtp_encryption, smtp_debug, smtp_user, smtp_password, smtp_encryption, smtp_debug,

11
app_common/models/mail_mail.py
View File

@@ -13,11 +13,12 @@ class MailMail(models.Model):
for m in self: for m in self:
email_to = m.email_to email_to = m.email_to
# 忽略掉无效email，避免被ban # 忽略掉无效email，避免被ban
if email_to.find('no-reply@odooai.cn') != -1 or email_to.find('postmaster-odoo@odooai.cn') != -1: if email_to:
pass if email_to.find('no-reply@odooai.cn') != -1 or email_to.find('postmaster-odoo@odooai.cn') != -1:
elif email_to.find('example.com') != -1 or email_to.find('@sunpop.cn') != -1 or email_to.find('@odooapp.cn') != -1: pass
_logger.error(_("=================Email to ignore: %s") % email_to) elif email_to.find('example.com') != -1 or email_to.find('@sunpop.cn') != -1 or email_to.find('@odooapp.cn') != -1:
self = self - m _logger.error(_("=================Email to ignore: %s") % email_to)
self = self - m
if not self: if not self:
return True return True
return super(MailMail, self)._send(auto_commit, raise_exception, smtp_session) return super(MailMail, self)._send(auto_commit, raise_exception, smtp_session)