From 23427e03f57a58ed6a25bd7dbb38a92178e46aa7 Mon Sep 17 00:00:00 2001 From: Ivan x390 Date: Tue, 3 Dec 2019 01:18:30 +0800 Subject: [PATCH] pos debrand --- app_odoo_customize/__manifest__.py | 2 +- .../models/base_language_install.py | 1 - app_odoo_customize/models/mail_thread.py | 31 +++++++++++-------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py index 282aea09..5f74b75e 100644 --- a/app_odoo_customize/__manifest__.py +++ b/app_odoo_customize/__manifest__.py @@ -23,7 +23,7 @@ { 'name': 'Odoo Customize(Debranding, My Odoo)', - 'version': '13.19.09.14', + 'version': '12.19.12.02', 'author': 'Sunpop.cn', 'category': 'Productivity', 'website': 'https://www.sunpop.cn', diff --git a/app_odoo_customize/models/base_language_install.py b/app_odoo_customize/models/base_language_install.py index 3d2932cc..c8fa7d95 100644 --- a/app_odoo_customize/models/base_language_install.py +++ b/app_odoo_customize/models/base_language_install.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# Copyright 2017 Jarvis (www.odoomod.com) # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from odoo import api, fields, models, _ diff --git a/app_odoo_customize/models/mail_thread.py b/app_odoo_customize/models/mail_thread.py index a570f7e6..15e532dc 100644 --- a/app_odoo_customize/models/mail_thread.py +++ b/app_odoo_customize/models/mail_thread.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# Copyright 2017 Jarvis (www.odoomod.com) # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from odoo import api, fields, models, _ @@ -8,32 +7,38 @@ from odoo import api, fields, models, _ class MailThread(models.AbstractModel): _inherit = "mail.thread" - @api.multi - def message_subscribe(self, partner_ids=None, channel_ids=None, subtype_ids=None, force=True): + def message_subscribe(self, partner_ids=None, channel_ids=None, subtype_ids=None): """ 停用订阅功能. """ ir_config = self.env['ir.config_parameter'] app_stop_subscribe = False if ir_config.get_param('app_stop_subscribe') == "True" else False if app_stop_subscribe: - return + return True else: - return super(MailThread, self).message_subscribe(partner_ids, channel_ids, subtype_ids, force) + return super(MailThread, self).message_subscribe(partner_ids, channel_ids, subtype_ids) - @api.multi - def message_auto_subscribe(self, updated_fields, values=None): + def _message_subscribe(self, partner_ids=None, channel_ids=None, subtype_ids=None, customer_ids=None): """ 停用订阅功能. """ ir_config = self.env['ir.config_parameter'] app_stop_subscribe = False if ir_config.get_param('app_stop_subscribe') == "True" else False if app_stop_subscribe: - return + return True else: - return super(MailThread, self).message_auto_subscribe(updated_fields, values) + return super(MailThread, self)._message_subscribe(partner_ids, channel_ids, subtype_ids, customer_ids) - @api.multi - def _message_auto_subscribe_notify(self, partner_ids): + def _message_auto_subscribe_followers(self, updated_values, default_subtype_ids): """ 停用订阅功能. """ ir_config = self.env['ir.config_parameter'] app_stop_subscribe = False if ir_config.get_param('app_stop_subscribe') == "True" else False if app_stop_subscribe: - return + return True else: - return super(MailThread, self)._message_auto_subscribe_notify(partner_ids) \ No newline at end of file + return super(MailThread, self)._message_auto_subscribe_followers(updated_values, default_subtype_ids) + + def _message_auto_subscribe_notify(self, partner_ids, template): + """ 停用订阅功能. """ + ir_config = self.env['ir.config_parameter'] + app_stop_subscribe = False if ir_config.get_param('app_stop_subscribe') == "True" else False + if app_stop_subscribe: + return True + else: + return super(MailThread, self)._message_auto_subscribe_notify( partner_ids, template)