From cf2ad0a751afba7b8a95f5cc78b7ac38a4a57a96 Mon Sep 17 00:00:00 2001 From: kongrattapong Date: Fri, 7 Feb 2020 10:36:45 +0700 Subject: [PATCH] [MIG] partner_contact_in_several_companies: Migration to 12.0 --- .../README.rst | 1 + .../__init__.py | 2 +- .../__manifest__.py | 7 ++--- .../models/__init__.py | 3 +- .../models/ir_actions.py | 3 +- .../models/res_partner.py | 29 ++++++++++--------- .../tests/__init__.py | 3 +- ...st_partner_contact_in_several_companies.py | 3 +- .../views/res_partner.xml | 2 +- 9 files changed, 26 insertions(+), 27 deletions(-) diff --git a/partner_contact_in_several_companies/README.rst b/partner_contact_in_several_companies/README.rst index f41a8c8d3..27ec4c416 100644 --- a/partner_contact_in_several_companies/README.rst +++ b/partner_contact_in_several_companies/README.rst @@ -74,6 +74,7 @@ Contributors * Richard deMeester * Nicolas JEUDY * Franco Tampieri +* Rattapong Chokmasermkul Maintainer ---------- diff --git a/partner_contact_in_several_companies/__init__.py b/partner_contact_in_several_companies/__init__.py index 83e553ac4..4b76c7b2d 100644 --- a/partner_contact_in_several_companies/__init__.py +++ b/partner_contact_in_several_companies/__init__.py @@ -1,3 +1,3 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import models diff --git a/partner_contact_in_several_companies/__manifest__.py b/partner_contact_in_several_companies/__manifest__.py index 46e949677..4b021062d 100644 --- a/partner_contact_in_several_companies/__manifest__.py +++ b/partner_contact_in_several_companies/__manifest__.py @@ -1,13 +1,12 @@ -# -*- coding: utf-8 -*- -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "Contacts in several partners", "summary": "Allow to have one contact in several partners", - "version": "11.0.1.0.1", + "version": "12.0.1.0.0", "category": "Customer Relationship Management", "website": "https://github.com/OCA/partner-contact", - "author": "Nicolas JEUDY,Odoo Community Association (OCA),Odoo SA", + "author": "Nicolas JEUDY, Odoo Community Association (OCA),Odoo SA", "license": "AGPL-3", "depends": [ "base", diff --git a/partner_contact_in_several_companies/models/__init__.py b/partner_contact_in_several_companies/models/__init__.py index 46c28af40..626a77aa9 100644 --- a/partner_contact_in_several_companies/models/__init__.py +++ b/partner_contact_in_several_companies/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import res_partner, ir_actions diff --git a/partner_contact_in_several_companies/models/ir_actions.py b/partner_contact_in_several_companies/models/ir_actions.py index 0608ca9e7..7a2ac5483 100644 --- a/partner_contact_in_several_companies/models/ir_actions.py +++ b/partner_contact_in_several_companies/models/ir_actions.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import api, models @@ -13,7 +12,7 @@ class IRActionsWindow(models.Model): for action in actions: if action.get('res_model', '') == 'res.partner': # By default, only show standalone contact - action_context = action.get('context', '{}') or '{}' + action_context = action.get('context', '{}') if 'search_show_all_positions' not in action_context: action['context'] = action_context.replace( '{', diff --git a/partner_contact_in_several_companies/models/res_partner.py b/partner_contact_in_several_companies/models/res_partner.py index ff9414429..32bcf2b12 100644 --- a/partner_contact_in_several_companies/models/res_partner.py +++ b/partner_contact_in_several_companies/models/res_partner.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import api, fields, models, _ +from odoo import api, fields, models from odoo.osv import expression @@ -9,20 +8,24 @@ class ResPartner(models.Model): _inherit = 'res.partner' contact_type = fields.Selection( - [('standalone', _('Standalone Contact')), - ('attached', _('Attached to existing Contact')), + [('standalone', 'Standalone Contact'), + ('attached', 'Attached to existing Contact'), ], compute='_compute_contact_type', store=True, index=True, default='standalone') - contact_id = fields.Many2one('res.partner', string='Main Contact', - domain=[('is_company', '=', False), - ('contact_type', '=', 'standalone'), - ], - ) - other_contact_ids = fields.One2many('res.partner', 'contact_id', - string='Others Positions') + contact_id = fields.Many2one( + 'res.partner', + string='Main Contact', + domain=[('is_company', '=', False), + ('contact_type', '=', 'standalone'), + ], + ) + other_contact_ids = fields.One2many( + 'res.partner', 'contact_id', + string='Others Positions', + ) @api.multi @api.depends('contact_id') @@ -59,8 +62,8 @@ class ResPartner(models.Model): ) attached_contacts = super(ResPartner, self).search( attached_contact_args) - args = expression.OR(( - expression.AND(([('contact_type', '=', 'standalone')], args)), + args = expression.OR((expression.AND(( + [('contact_type', '=', 'standalone')], args)), [('other_contact_ids', 'in', attached_contacts.ids)], )) return super(ResPartner, self).search(args, offset=offset, diff --git a/partner_contact_in_several_companies/tests/__init__.py b/partner_contact_in_several_companies/tests/__init__.py index 8a8361492..f75e1105a 100644 --- a/partner_contact_in_several_companies/tests/__init__.py +++ b/partner_contact_in_several_companies/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import test_partner_contact_in_several_companies diff --git a/partner_contact_in_several_companies/tests/test_partner_contact_in_several_companies.py b/partner_contact_in_several_companies/tests/test_partner_contact_in_several_companies.py index 5686550cc..e79f20493 100644 --- a/partner_contact_in_several_companies/tests/test_partner_contact_in_several_companies.py +++ b/partner_contact_in_several_companies/tests/test_partner_contact_in_several_companies.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from odoo.tests import common diff --git a/partner_contact_in_several_companies/views/res_partner.xml b/partner_contact_in_several_companies/views/res_partner.xml index dffd11bde..51c2e1313 100644 --- a/partner_contact_in_several_companies/views/res_partner.xml +++ b/partner_contact_in_several_companies/views/res_partner.xml @@ -49,7 +49,7 @@ - +