From 4f13432bdcdbc85e8447c322829ebc6017bc891e Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 26 Oct 2022 22:03:36 +0200 Subject: [PATCH] [MIG] base_usability to v16 --- base_usability/__manifest__.py | 6 +++--- base_usability/models/ir_actions_report.py | 2 +- base_usability/models/ir_mail_server.py | 19 +++++++++---------- base_usability/models/ir_model.py | 2 +- base_usability/models/res_company.py | 2 +- base_usability/models/res_partner.py | 2 +- base_usability/models/res_partner_bank.py | 2 +- base_usability/models/res_partner_category.py | 2 +- base_usability/models/res_users.py | 2 +- base_usability/security/group.xml | 2 +- base_usability/views/ir_module.xml | 2 +- base_usability/views/res_country.xml | 2 +- base_usability/views/res_partner.xml | 6 +++--- base_usability/views/res_partner_bank.xml | 7 ++++++- 14 files changed, 31 insertions(+), 27 deletions(-) diff --git a/base_usability/__manifest__.py b/base_usability/__manifest__.py index 4252f31..817e0da 100644 --- a/base_usability/__manifest__.py +++ b/base_usability/__manifest__.py @@ -1,10 +1,10 @@ -# Copyright 2014-2020 Akretion France (http://www.akretion.com) +# Copyright 2014-2022 Akretion France (http://www.akretion.com) # @author Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Base Usability', - 'version': '14.0.1.0.0', + 'version': '16.0.1.0.0', 'category': 'Partner', 'license': 'AGPL-3', 'summary': 'Better usability in base module', @@ -22,5 +22,5 @@ 'views/ir_sequence.xml', 'views/ir_property.xml', ], - 'installable': False, + 'installable': True, } diff --git a/base_usability/models/ir_actions_report.py b/base_usability/models/ir_actions_report.py index 55c5b18..6d5621b 100644 --- a/base_usability/models/ir_actions_report.py +++ b/base_usability/models/ir_actions_report.py @@ -1,4 +1,4 @@ -# Copyright 2021 Akretion France (http://www.akretion.com/) +# Copyright 2022 Akretion France (http://www.akretion.com/) # @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). diff --git a/base_usability/models/ir_mail_server.py b/base_usability/models/ir_mail_server.py index a6cba6d..f8daff5 100644 --- a/base_usability/models/ir_mail_server.py +++ b/base_usability/models/ir_mail_server.py @@ -1,9 +1,8 @@ -# Copyright 2015-2020 Akretion France (http://www.akretion.com/) +# Copyright 2015-2022 Akretion France (http://www.akretion.com/) # @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import api, models -from odoo.addons.base.models.ir_mail_server import extract_rfc2822_addresses import logging logger = logging.getLogger(__name__) @@ -14,14 +13,13 @@ 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): + self, message, mail_server_id=None, smtp_server=None, smtp_port=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): # Start copy from native method - smtp_from = message['Return-Path'] or\ - self._get_default_bounce_address() or message['From'] - from_rfc2822 = extract_rfc2822_addresses(smtp_from) - smtp_from = from_rfc2822[-1] + smtp_from, smtp_to_list, message = self._prepare_email_message( + message, smtp_session) # End copy from native method logger.info( "Sending email from '%s' to '%s' Cc '%s' Bcc '%s' " @@ -32,5 +30,6 @@ 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_ssl_certificate=smtp_ssl_certificate, + smtp_ssl_private_key=smtp_ssl_private_key, smtp_debug=smtp_debug, smtp_session=smtp_session) diff --git a/base_usability/models/ir_model.py b/base_usability/models/ir_model.py index bc02563..7e021e1 100644 --- a/base_usability/models/ir_model.py +++ b/base_usability/models/ir_model.py @@ -1,4 +1,4 @@ -# Copyright 2019 Akretion France (http://www.akretion.com/) +# Copyright 2019-2022 Akretion France (http://www.akretion.com/) # @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). diff --git a/base_usability/models/res_company.py b/base_usability/models/res_company.py index eef598a..2e57ab5 100644 --- a/base_usability/models/res_company.py +++ b/base_usability/models/res_company.py @@ -1,4 +1,4 @@ -# Copyright 2015-2020 Akretion France (http://www.akretion.com/) +# Copyright 2015-2022 Akretion France (http://www.akretion.com/) # @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). diff --git a/base_usability/models/res_partner.py b/base_usability/models/res_partner.py index 42caa4e..59328ad 100644 --- a/base_usability/models/res_partner.py +++ b/base_usability/models/res_partner.py @@ -1,4 +1,4 @@ -# Copyright 2015-2020 Akretion France (http://www.akretion.com/) +# Copyright 2015-2022 Akretion France (http://www.akretion.com/) # @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). diff --git a/base_usability/models/res_partner_bank.py b/base_usability/models/res_partner_bank.py index c668585..bcb7e4a 100644 --- a/base_usability/models/res_partner_bank.py +++ b/base_usability/models/res_partner_bank.py @@ -1,4 +1,4 @@ -# Copyright 2015-2020 Akretion France (http://www.akretion.com/) +# Copyright 2015-2022 Akretion France (http://www.akretion.com/) # @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). diff --git a/base_usability/models/res_partner_category.py b/base_usability/models/res_partner_category.py index b6fcf4c..966167c 100644 --- a/base_usability/models/res_partner_category.py +++ b/base_usability/models/res_partner_category.py @@ -1,4 +1,4 @@ -# Copyright 2015-2020 Akretion France (http://www.akretion.com/) +# Copyright 2015-2022 Akretion France (http://www.akretion.com/) # @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). diff --git a/base_usability/models/res_users.py b/base_usability/models/res_users.py index 5cfe877..9def51a 100644 --- a/base_usability/models/res_users.py +++ b/base_usability/models/res_users.py @@ -1,4 +1,4 @@ -# Copyright 2018-2020 Akretion France (http://www.akretion.com/) +# Copyright 2018-2022 Akretion France (http://www.akretion.com/) # @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). diff --git a/base_usability/security/group.xml b/base_usability/security/group.xml index 6d41c6b..78d827c 100644 --- a/base_usability/security/group.xml +++ b/base_usability/security/group.xml @@ -1,6 +1,6 @@ diff --git a/base_usability/views/ir_module.xml b/base_usability/views/ir_module.xml index 869fca2..83785b3 100644 --- a/base_usability/views/ir_module.xml +++ b/base_usability/views/ir_module.xml @@ -1,6 +1,6 @@ diff --git a/base_usability/views/res_country.xml b/base_usability/views/res_country.xml index e55ef48..48a7015 100644 --- a/base_usability/views/res_country.xml +++ b/base_usability/views/res_country.xml @@ -1,6 +1,6 @@ diff --git a/base_usability/views/res_partner.xml b/base_usability/views/res_partner.xml index 829560b..9cd7bd4 100644 --- a/base_usability/views/res_partner.xml +++ b/base_usability/views/res_partner.xml @@ -1,6 +1,6 @@ @@ -54,9 +54,9 @@ - Name or Email or Reference + Name or Email or VAT or Reference - ['|','|',('display_name','ilike',self),('ref','=ilike',self + '%'),('email','ilike',self)] + ['|', '|', '|', '|', ('display_name', 'ilike', self), ('ref', '=ilike', self + '%'), ('email', 'ilike', self), ('vat', 'ilike', self), ('company_registry', 'ilike', self)] diff --git a/base_usability/views/res_partner_bank.xml b/base_usability/views/res_partner_bank.xml index fcbd9b2..3f3eb09 100644 --- a/base_usability/views/res_partner_bank.xml +++ b/base_usability/views/res_partner_bank.xml @@ -1,10 +1,11 @@ + base_usability.res.partner.bank.tree res.partner.bank @@ -16,6 +17,10 @@ + + + +