diff --git a/partner_sector/README.rst b/partner_sector/README.rst index a4bcf85e0..714b7b81c 100644 --- a/partner_sector/README.rst +++ b/partner_sector/README.rst @@ -1,6 +1,6 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png + :target: https://www.gnu.org/licenses/agpl + :alt: License: AGPL-3 ============== Partner Sector @@ -14,16 +14,12 @@ Configuration To manage sectors, you need to: -* Go to *Sales > Configuration > Contacts > Sectors*. +* Go to *Contacts > Configuration > Contacts > Sectors*. By default only companies have sectors. To activate sectors in individuals also, you need to activate the following setting: -* Go to *Settings > General Settings > Sector in contacts > Use sector for individuals* - -Or, if you have *Sales* or *CRM* modules installed: - -* Go to *Sales > Configuration > Settings > Partner Sector > Use sector for individuals* +* Go to *Settings > General Settings > Partner Sectors > Sector in contacts > Use sector for individuals* Usage @@ -36,7 +32,7 @@ To use this module, you need to: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/134/10.0 + :target: https://runbot.odoo-community.org/runbot/134/11.0 Known issues / Roadmap ====================== @@ -54,6 +50,11 @@ spotted it first, help us smashing it by providing a detailed and welcomed feedb Credits ======= +Images +------ + +* Odoo Community Association: `Icon `_. + Contributors ------------ diff --git a/partner_sector/__init__.py b/partner_sector/__init__.py index a77a6fcbc..83e553ac4 100644 --- a/partner_sector/__init__.py +++ b/partner_sector/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/partner_sector/__manifest__.py b/partner_sector/__manifest__.py index 39a54ffbf..a1f40ed01 100644 --- a/partner_sector/__manifest__.py +++ b/partner_sector/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2015 Antiun Ingenieria S.L. - Javier Iniesta # Copyright 2016-2017 Tecnativa S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -6,22 +5,21 @@ { "name": "Partner Sector", "summary": "Add partner sectors", - "version": "10.0.1.1.0", + "version": "11.0.1.0.0", "category": "Customer Relationship Management", - "website": "http://www.tecnativa.com", + "website": "https://github.com/OCA/partner-contact", "author": "Tecnativa, Odoo Community Association (OCA)", "license": "AGPL-3", - "application": False, "installable": True, "depends": [ - "sales_team", + "base_setup", + "contacts", ], "data": [ "security/ir.model.access.csv", "security/partner_sector_security.xml", "views/res_partner_sector_view.xml", "views/res_partner_view.xml", - "views/base_config_settings.xml", - "views/sale_config_settings.xml" + "views/res_config_settings.xml", ] } diff --git a/partner_sector/models/__init__.py b/partner_sector/models/__init__.py index a265df98f..c88809dad 100644 --- a/partner_sector/models/__init__.py +++ b/partner_sector/models/__init__.py @@ -1,9 +1,5 @@ -# -*- coding: utf-8 -*- -# © 2015 Antiun Ingenieria S.L. - Javier Iniesta -# © 2016 Tecnativa S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import res_partner from . import res_partner_sector -from . import base_config_settings -from . import sale_config_settings +from . import res_config_settings diff --git a/partner_sector/models/base_config_settings.py b/partner_sector/models/base_config_settings.py deleted file mode 100644 index e5733a7eb..000000000 --- a/partner_sector/models/base_config_settings.py +++ /dev/null @@ -1,14 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2018 Eficent Business and IT Consulting Services, S.L. - -from odoo import fields, models - - -class BaseConfigSettings(models.TransientModel): - _inherit = 'base.config.settings' - - group_use_partner_sector_for_person = fields.Boolean( - 'Use sector for individuals', - help="Set if you want to be able use sectors for " - "individuals also.", - implied_group='partner_sector.group_use_partner_sector_for_person') diff --git a/partner_sector/models/sale_config_settings.py b/partner_sector/models/res_config_settings.py similarity index 70% rename from partner_sector/models/sale_config_settings.py rename to partner_sector/models/res_config_settings.py index ff78cc09a..3748cc25b 100644 --- a/partner_sector/models/sale_config_settings.py +++ b/partner_sector/models/res_config_settings.py @@ -1,11 +1,11 @@ -# -*- coding: utf-8 -*- # Copyright 2018 Eficent Business and IT Consulting Services, S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import fields, models -class SaleConfigSettings(models.TransientModel): - _inherit = 'sale.config.settings' +class ResConfigSettings(models.TransientModel): + _inherit = 'res.config.settings' group_use_partner_sector_for_person = fields.Boolean( 'Use sector for individuals', diff --git a/partner_sector/models/res_partner.py b/partner_sector/models/res_partner.py index 0d7fcbecf..7ed1d4a5a 100644 --- a/partner_sector/models/res_partner.py +++ b/partner_sector/models/res_partner.py @@ -1,9 +1,8 @@ -# -*- coding: utf-8 -*- -# © 2015 Antiun Ingenieria S.L. - Javier Iniesta -# © 2016 Tecnativa S.L. - Vicent Cubells +# Copyright 2015 Antiun Ingenieria S.L. - Javier Iniesta +# Copyright 2016 Tecnativa S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import models, fields, api, exceptions, _ +from odoo import api, exceptions, fields, models, _ class ResPartner(models.Model): @@ -19,5 +18,5 @@ class ResPartner(models.Model): @api.constrains('sector_id', 'secondary_sector_ids') def _check_sectors(self): if self.sector_id in self.secondary_sector_ids: - raise exceptions.Warning(_('The main sector must be different ' + raise exceptions.UserError(_('The main sector must be different ' 'from the secondary sectors.')) diff --git a/partner_sector/models/res_partner_sector.py b/partner_sector/models/res_partner_sector.py index 1dacb810c..ddca30935 100644 --- a/partner_sector/models/res_partner_sector.py +++ b/partner_sector/models/res_partner_sector.py @@ -1,10 +1,9 @@ -# -*- coding: utf-8 -*- -# © 2015 Antiun Ingenieria S.L. - Javier Iniesta -# © 2016 Tecnativa S.L. - Vicent Cubells -# © 2016 Tecnativa S.L. - Pedro M. Baeza +# Copyright 2015 Antiun Ingenieria S.L. - Javier Iniesta +# Copyright 2016 Tecnativa S.L. - Vicent Cubells +# Copyright 2016 Tecnativa S.L. - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import _, api, fields, exceptions, models +from odoo import api, exceptions, fields, models, _ class ResPartnerSector(models.Model): @@ -29,11 +28,11 @@ class ResPartnerSector(models.Model): """ Return the list [cat.name, cat.parent_id.name, ...] """ res = [] while cat: - res.append(cat.name) + res.insert(0, cat.name) cat = cat.parent_id return res - return [(cat.id, " / ".join(reversed(get_names(cat)))) for cat in self] + return [(cat.id, " / ".join(get_names(cat))) for cat in self] @api.constrains('parent_id') def _check_parent_id(self): diff --git a/partner_sector/tests/__init__.py b/partner_sector/tests/__init__.py index 844191e01..151d9a105 100644 --- a/partner_sector/tests/__init__.py +++ b/partner_sector/tests/__init__.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -# © 2015 Antiun Ingenieria S.L. - Javier Iniesta -# © 2016 Tecnativa S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import test_res_partner_sector diff --git a/partner_sector/tests/test_res_partner_sector.py b/partner_sector/tests/test_res_partner_sector.py index 6b0e982e8..611d7b189 100644 --- a/partner_sector/tests/test_res_partner_sector.py +++ b/partner_sector/tests/test_res_partner_sector.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- -# © 2015 Antiun Ingenieria S.L. - Javier Iniesta -# © 2016 Tecnativa S.L. - Vicent Cubells -# © 2016 Tecnativa S.L. - Pedro M. Baeza +# Copyright 2015 Antiun Ingenieria S.L. - Javier Iniesta +# Copyright 2016 Tecnativa S.L. - Vicent Cubells +# Copyright 2016 Tecnativa S.L. - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo.tests import common diff --git a/partner_sector/views/base_config_settings.xml b/partner_sector/views/base_config_settings.xml deleted file mode 100644 index 815f7b261..000000000 --- a/partner_sector/views/base_config_settings.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - General Settings - base.config.settings - - - - - - - - - - diff --git a/partner_sector/views/res_config_settings.xml b/partner_sector/views/res_config_settings.xml new file mode 100644 index 000000000..92671613a --- /dev/null +++ b/partner_sector/views/res_config_settings.xml @@ -0,0 +1,30 @@ + + + + + + res.config.settings.view.form + res.config.settings + + + +

Partner Sectors

+
+
+
+ +
+
+
+
+
+ + + + + diff --git a/partner_sector/views/res_partner_sector_view.xml b/partner_sector/views/res_partner_sector_view.xml index e0d5412f8..065b75c30 100644 --- a/partner_sector/views/res_partner_sector_view.xml +++ b/partner_sector/views/res_partner_sector_view.xml @@ -1,5 +1,5 @@ - @@ -24,7 +24,7 @@ diff --git a/partner_sector/views/res_partner_view.xml b/partner_sector/views/res_partner_view.xml index bfe9c6325..b26b025fc 100644 --- a/partner_sector/views/res_partner_view.xml +++ b/partner_sector/views/res_partner_view.xml @@ -1,5 +1,6 @@ - diff --git a/partner_sector/views/sale_config_settings.xml b/partner_sector/views/sale_config_settings.xml deleted file mode 100644 index 9fd708b56..000000000 --- a/partner_sector/views/sale_config_settings.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - partner sector settings - sale.config.settings - - -
- - -
- - -