From 755e9479686e591001914691e36fbad653a90c21 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Wed, 28 Mar 2018 12:47:01 +0200 Subject: [PATCH] [9.0][IMP] partner_sector: allow to search for Main sector and children. --- partner_sector/README.rst | 1 + partner_sector/__openerp__.py | 2 +- partner_sector/models/res_partner.py | 15 +++++++++++---- partner_sector/models/res_partner_sector.py | 13 ++++++++++++- partner_sector/views/res_partner_sector_view.xml | 1 + partner_sector/views/res_partner_view.xml | 1 + 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/partner_sector/README.rst b/partner_sector/README.rst index 684172e7e..6cf40d272 100644 --- a/partner_sector/README.rst +++ b/partner_sector/README.rst @@ -55,6 +55,7 @@ Contributors * Javier Iniesta * Vicent Cubells * Pedro M. Baeza +* Lois Rilo Maintainer ---------- diff --git a/partner_sector/__openerp__.py b/partner_sector/__openerp__.py index 41badc2df..86c8b4809 100644 --- a/partner_sector/__openerp__.py +++ b/partner_sector/__openerp__.py @@ -6,7 +6,7 @@ { "name": "Partner Sector", "summary": "Add partner sectors", - "version": "9.0.1.1.2", + "version": "9.0.1.2.0", "category": "Customer Relationship Management", "website": "http://www.tecnativa.com", "author": "Tecnativa, Odoo Community Association (OCA)", diff --git a/partner_sector/models/res_partner.py b/partner_sector/models/res_partner.py index b362f999a..51a26cc12 100644 --- a/partner_sector/models/res_partner.py +++ b/partner_sector/models/res_partner.py @@ -9,12 +9,19 @@ from openerp import models, fields, api, exceptions, _ class ResPartner(models.Model): _inherit = 'res.partner' - sector_id = fields.Many2one(comodel_name='res.partner.sector', - string='Main Sector') - + sector_id = fields.Many2one( + comodel_name='res.partner.sector', + string='Main Sector', + ) + sector_complete_name = fields.Char( + string="Main Sector Complete Name", + related="sector_id.complete_name", + readonly=True, + ) secondary_sector_ids = fields.Many2many( comodel_name='res.partner.sector', string="Secondary Sectors", - domain="[('id', '!=', sector_id)]") + domain="[('id', '!=', sector_id)]", + ) @api.constrains('sector_id', 'secondary_sector_ids') def _check_sectors(self): diff --git a/partner_sector/models/res_partner_sector.py b/partner_sector/models/res_partner_sector.py index 8570bd238..0b74f600a 100644 --- a/partner_sector/models/res_partner_sector.py +++ b/partner_sector/models/res_partner_sector.py @@ -23,6 +23,17 @@ class ResPartnerSector(models.Model): string="Children") parent_left = fields.Integer('Parent Left', select=True) parent_right = fields.Integer('Parent Right', select=True) + complete_name = fields.Char( + string="Complete Name", + compute='_compute_complete_name', + store=True, + ) + + @api.multi + @api.depends("name", "parent_id", "parent_id.name") + def _compute_complete_name(self): + for rec in self: + rec.complete_name = rec.display_name @api.multi def name_get(self): @@ -30,7 +41,7 @@ class ResPartnerSector(models.Model): """ Return the list [cat.name, cat.parent_id.name, ...] """ res = [] while cat: - res.append(cat.name) + res.append(cat.name or '/') cat = cat.parent_id return res diff --git a/partner_sector/views/res_partner_sector_view.xml b/partner_sector/views/res_partner_sector_view.xml index e614ac998..bd9462ba6 100644 --- a/partner_sector/views/res_partner_sector_view.xml +++ b/partner_sector/views/res_partner_sector_view.xml @@ -16,6 +16,7 @@ + diff --git a/partner_sector/views/res_partner_view.xml b/partner_sector/views/res_partner_view.xml index 2f433196f..1e4dd04e6 100644 --- a/partner_sector/views/res_partner_view.xml +++ b/partner_sector/views/res_partner_view.xml @@ -36,6 +36,7 @@ +