Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MIG] base_usability: Migration to 12.0

Browse Source
This commit is contained in:
Raphaël Valyi
2018-12-25 15:29:56 -02:00
parent 04b91380a4
commit b78e1f50dc
9 changed files with 33 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
base_usability/mail.py
View File

@@ -1,9 +1,8 @@
# -*- coding: utf-8 -*-
# © 2015-2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import models, api
from odoo.addons.base.ir.ir_mail_server import extract_rfc2822_addresses
from odoo.addons.base.models.ir_mail_server import extract_rfc2822_addresses
import logging
logger = logging.getLogger(__name__)
@@ -16,7 +15,7 @@ class IrMailServer(models.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_encryption=None, smtp_debug=False, smtp_session=None):
# Start copy from native method
smtp_from = message['Return-Path'] or\
self._get_default_bounce_address() or message['From']
@@ -32,4 +31,5 @@ class IrMailServer(models.Model):
message, mail_server_id=mail_server_id,
smtp_server=smtp_server, smtp_port=smtp_port,
smtp_user=smtp_user, smtp_password=smtp_password,
smtp_encryption=smtp_encryption, smtp_debug=smtp_debug)
smtp_encryption=smtp_encryption, smtp_debug=smtp_debug,
smtp_session=smtp_session)