From 981f2ad85830e8e801d71d0b21632462f0974fb1 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 29 Jan 2019 12:09:47 +0100 Subject: [PATCH] MIG base_company_extension and base_partner_ref from v10 to v12 --- base_company_extension/__init__.py | 2 - base_company_extension/__manifest__.py | 4 +- base_company_extension/company.py | 3 +- base_company_extension/company_view.xml | 2 +- base_partner_ref/__init__.py | 2 - base_partner_ref/__manifest__.py | 5 +- base_partner_ref/partner.py | 70 +++++++++++++------------ base_partner_ref/partner_view.xml | 2 +- 8 files changed, 43 insertions(+), 47 deletions(-) diff --git a/base_company_extension/__init__.py b/base_company_extension/__init__.py index 4a5557a..52e1016 100644 --- a/base_company_extension/__init__.py +++ b/base_company_extension/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import company diff --git a/base_company_extension/__manifest__.py b/base_company_extension/__manifest__.py index 55d82fe..4fb56ca 100644 --- a/base_company_extension/__manifest__.py +++ b/base_company_extension/__manifest__.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- -# © 2014-2016 Akretion (http://www.akretion.com) +# Copyright 2014-2019 Akretion (http://www.akretion.com) # @author Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Base Company Extension', - 'version': '10.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Partner', 'license': 'AGPL-3', 'summary': 'Adds capital and title on company', diff --git a/base_company_extension/company.py b/base_company_extension/company.py index 46663c6..4035025 100644 --- a/base_company_extension/company.py +++ b/base_company_extension/company.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# © 2014-2016 Akretion (http://www.akretion.com) +# Copyright 2014-2019 Akretion (http://www.akretion.com) # @author Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). diff --git a/base_company_extension/company_view.xml b/base_company_extension/company_view.xml index da447c8..da60874 100644 --- a/base_company_extension/company_view.xml +++ b/base_company_extension/company_view.xml @@ -1,6 +1,6 @@ diff --git a/base_partner_ref/__init__.py b/base_partner_ref/__init__.py index 61cf8b2..4da81fa 100644 --- a/base_partner_ref/__init__.py +++ b/base_partner_ref/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import partner diff --git a/base_partner_ref/__manifest__.py b/base_partner_ref/__manifest__.py index 84d78be..9936a06 100644 --- a/base_partner_ref/__manifest__.py +++ b/base_partner_ref/__manifest__.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- -# © 2017 Akretion (http://www.akretion.com) +# Copyright 2017-2019 Akretion (http://www.akretion.com) # @author Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Base Partner Reference', - 'version': '10.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Partner', 'license': 'AGPL-3', 'summary': "Improve usage of partner's Internal Reference", diff --git a/base_partner_ref/partner.py b/base_partner_ref/partner.py index e358523..df43acb 100644 --- a/base_partner_ref/partner.py +++ b/base_partner_ref/partner.py @@ -1,8 +1,8 @@ -# -*- coding: utf-8 -*- -# © 2017 Akretion (Alexis de Lattre ) +# Copyright 2017-2019 Akretion +# @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import models, fields, api, _ +from odoo import models, fields class ResPartner(models.Model): @@ -16,34 +16,36 @@ class ResPartner(models.Model): 'A partner already exists with this internal reference!' )] - @api.multi - def name_get(self): - res = [] - for partner in self: - name = partner.name or '' - # START modif of native name_get() method - if partner.ref: - name = u"[%s] %s" % (partner.ref, name) - # END modif of native name_get() method - if partner.company_name or partner.parent_id: - if not name and partner.type in ['invoice', 'delivery', 'other']: - name = dict(self.fields_get(['type'])['type']['selection'])[partner.type] - if not partner.is_company: - # START modif of native name_get() method - company_name = partner.commercial_company_name or partner.parent_id.name - if partner.parent_id.ref: - company_name = u"[%s] %s" % (partner.parent_id.ref, company_name) - name = "%s, %s" % (company_name, name) - # END modif of native name_get() method - if self._context.get('show_address_only'): - name = partner._display_address(without_company=True) - if self._context.get('show_address'): - name = name + "\n" + partner._display_address(without_company=True) - name = name.replace('\n\n', '\n') - name = name.replace('\n\n', '\n') - if self._context.get('show_email') and partner.email: - name = "%s <%s>" % (name, partner.email) - if self._context.get('html_format'): - name = name.replace('\n', '
') - res.append((partner.id, name)) - return res + def _get_name(self): + partner = self + name = partner.name or '' + + # START modif of native method + if partner.ref: + name = u"[%s] %s" % (partner.ref, name) + # END modif of native method + if partner.company_name or partner.parent_id: + if not name and partner.type in ['invoice', 'delivery', 'other']: + name = dict(self.fields_get(['type'])['type']['selection'])[partner.type] + if not partner.is_company: + # START modif of native name_get() method + company_name = partner.commercial_company_name or partner.parent_id.name + if partner.parent_id.ref: + company_name = u"[%s] %s" % (partner.parent_id.ref, company_name) + name = "%s, %s" % (company_name, name) + # END modif of native name_get() method + if self._context.get('show_address_only'): + name = partner._display_address(without_company=True) + if self._context.get('show_address'): + name = name + "\n" + partner._display_address(without_company=True) + name = name.replace('\n\n', '\n') + name = name.replace('\n\n', '\n') + if self._context.get('address_inline'): + name = name.replace('\n', ', ') + if self._context.get('show_email') and partner.email: + name = "%s <%s>" % (name, partner.email) + if self._context.get('html_format'): + name = name.replace('\n', '
') + if self._context.get('show_vat') and partner.vat: + name = "%s ‒ %s" % (name, partner.vat) + return name diff --git a/base_partner_ref/partner_view.xml b/base_partner_ref/partner_view.xml index 033d508..c18af95 100644 --- a/base_partner_ref/partner_view.xml +++ b/base_partner_ref/partner_view.xml @@ -1,6 +1,6 @@