From 057ad5ea636c99ec0303037cab7e1576f36ac759 Mon Sep 17 00:00:00 2001 From: Jordi Ballester Alomar Date: Mon, 23 Jan 2017 10:02:23 -0700 Subject: [PATCH 01/39] sales_team_operating_unit (#35) * [ADD] sales_team_operating_unit --- sales_team_operating_unit/README.rst | 61 ++++++++++++++++ sales_team_operating_unit/__init__.py | 5 ++ sales_team_operating_unit/__openerp__.py | 20 +++++ sales_team_operating_unit/models/__init__.py | 5 ++ sales_team_operating_unit/models/crm_team.py | 15 ++++ .../security/crm_security.xml | 20 +++++ .../static/description/icon.png | Bin 0 -> 9455 bytes sales_team_operating_unit/tests/__init__.py | 5 ++ .../tests/test_crm_team_operating_unit.py | 69 ++++++++++++++++++ .../views/crm_team_view.xml | 46 ++++++++++++ 10 files changed, 246 insertions(+) create mode 100644 sales_team_operating_unit/README.rst create mode 100644 sales_team_operating_unit/__init__.py create mode 100644 sales_team_operating_unit/__openerp__.py create mode 100644 sales_team_operating_unit/models/__init__.py create mode 100644 sales_team_operating_unit/models/crm_team.py create mode 100644 sales_team_operating_unit/security/crm_security.xml create mode 100644 sales_team_operating_unit/static/description/icon.png create mode 100644 sales_team_operating_unit/tests/__init__.py create mode 100644 sales_team_operating_unit/tests/test_crm_team_operating_unit.py create mode 100644 sales_team_operating_unit/views/crm_team_view.xml diff --git a/sales_team_operating_unit/README.rst b/sales_team_operating_unit/README.rst new file mode 100644 index 0000000000..7510a26cf8 --- /dev/null +++ b/sales_team_operating_unit/README.rst @@ -0,0 +1,61 @@ +.. image:: https://img.shields.io/badge/license-LGPLv3-blue.svg + :target: https://www.gnu.org/licenses/lgpl.html + :alt: License: LGPL-3 + +========================= +Sales Team Operating Unit +========================= + +This module introduces the following features: + +* Adds the Operating Unit (OU) to the Sales Team. + +* The user's default Operating Unit (OU) is proposed at the time of creating + the Sales Team. + +* Security rules are defined to ensure that users can only see the Sales Team + of that Operating Units in which they are allowed access to. + + +Usage +===== + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/213/9.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Jordi Ballester Alomar + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/sales_team_operating_unit/__init__.py b/sales_team_operating_unit/__init__.py new file mode 100644 index 0000000000..b6f6916a4a --- /dev/null +++ b/sales_team_operating_unit/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2016 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from . import models diff --git a/sales_team_operating_unit/__openerp__.py b/sales_team_operating_unit/__openerp__.py new file mode 100644 index 0000000000..7750bffec6 --- /dev/null +++ b/sales_team_operating_unit/__openerp__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# © 2016 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +{ + "name": "Sales Team Operating Unit", + "version": "9.0.1.0.0", + "author": "Eficent, " + "Serpent Consulting Services Pvt. Ltd.," + "Odoo Community Association (OCA)", + "license": "LGPL-3", + "website": "http://www.eficent.com", + "category": "Sales", + "depends": ["sales_team", "operating_unit"], + "data": [ + "views/crm_team_view.xml", + "security/crm_security.xml", + ], + 'installable': True, +} diff --git a/sales_team_operating_unit/models/__init__.py b/sales_team_operating_unit/models/__init__.py new file mode 100644 index 0000000000..57b4906011 --- /dev/null +++ b/sales_team_operating_unit/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2016 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from . import crm_team diff --git a/sales_team_operating_unit/models/crm_team.py b/sales_team_operating_unit/models/crm_team.py new file mode 100644 index 0000000000..bbb5300c7d --- /dev/null +++ b/sales_team_operating_unit/models/crm_team.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# © 2015 Eficent Business and IT Consulting Services S.L. +# © 2015 Serpent Consulting Services Pvt. Ltd. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). +from openerp import fields, models + + +class CRMTeam(models.Model): + + _inherit = 'crm.team' + + operating_unit_id = fields.Many2one('operating.unit', 'Operating Unit', + default=lambda self: + self.env['res.users']. + operating_unit_default_get(self._uid)) diff --git a/sales_team_operating_unit/security/crm_security.xml b/sales_team_operating_unit/security/crm_security.xml new file mode 100644 index 0000000000..54a11eb6dd --- /dev/null +++ b/sales_team_operating_unit/security/crm_security.xml @@ -0,0 +1,20 @@ + + + + + + + + ['|',('operating_unit_id','=',False),('operating_unit_id','in',[g.id for g in user.operating_unit_ids])] + Sales Teams from allowed operating units + + + + + + + + + diff --git a/sales_team_operating_unit/static/description/icon.png b/sales_team_operating_unit/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/sales_team_operating_unit/tests/__init__.py b/sales_team_operating_unit/tests/__init__.py new file mode 100644 index 0000000000..4254efc93e --- /dev/null +++ b/sales_team_operating_unit/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2016 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from . import test_crm_team_operating_unit diff --git a/sales_team_operating_unit/tests/test_crm_team_operating_unit.py b/sales_team_operating_unit/tests/test_crm_team_operating_unit.py new file mode 100644 index 0000000000..aaec15871d --- /dev/null +++ b/sales_team_operating_unit/tests/test_crm_team_operating_unit.py @@ -0,0 +1,69 @@ +# -*- coding: utf-8 -*- +# © 2016 Eficent Business and IT Consulting Services S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +from openerp.tests import common + + +class TestSaleTeamOperatingUnit(common.TransactionCase): + + def setUp(self): + super(TestSaleTeamOperatingUnit, self).setUp() + self.res_users_model = self.env['res.users'] + self.crm_team_model = self.registry('crm.team') + # Groups + self.grp_sale_mngr = self.env.ref('base.group_sale_manager') + self.grp_user = self.env.ref('base.group_user') + # Company + self.company = self.env.ref('base.main_company') + # Main Operating Unit + self.ou1 = self.env.ref('operating_unit.main_operating_unit') + # B2C Operating Unit + self.b2c = self.env.ref('operating_unit.b2c_operating_unit') + # Create User 1 with Main OU + self.user1 = self._create_user('user_1', [self.grp_sale_mngr, + self.grp_user], self.company, + [self.ou1]) + # Create User 2 with B2C OU + self.user2 = self._create_user('user_2', [self.grp_sale_mngr, + self.grp_user], self.company, + [self.b2c]) + # Create CRM teams + self.team1 = self._create_crm_team(self.user1.id, self.ou1) + self.team2 = self._create_crm_team(self.user2.id, self.b2c) + + def _create_user(self, login, groups, company, operating_units, + context=None): + """ Create a user. """ + group_ids = [group.id for group in groups] + user = self.res_users_model.create({ + 'name': 'Test User', + 'login': login, + 'password': 'demo', + 'email': 'test@yourcompany.com', + 'company_id': company.id, + 'company_ids': [(4, company.id)], + 'operating_unit_ids': [(4, ou.id) for ou in operating_units], + 'groups_id': [(6, 0, group_ids)] + }) + return user + + def _create_crm_team(self, uid, operating_unit): + """Create a sale order.""" + context = {'mail_create_nosubscribe': True} + crm = self.crm_team_model.create(self.cr, uid, + {'name': 'CRM team', + 'operating_unit_id': + operating_unit.id}, + context=context) + return crm + + def test_crm_team(self): + # User 2 is only assigned to B2C Operating Unit, and cannot + # access CRM teams for Main Operating Unit. + + team = self.crm_team_model.search( + self.cr, self.user2.id, [('id', '=', self.team1), + ('operating_unit_id', '=', self.ou1.id)]) + self.assertEqual(team, [], 'User 2 should not have access to ' + '%s' % self.ou1.name) diff --git a/sales_team_operating_unit/views/crm_team_view.xml b/sales_team_operating_unit/views/crm_team_view.xml new file mode 100644 index 0000000000..fda6cd5233 --- /dev/null +++ b/sales_team_operating_unit/views/crm_team_view.xml @@ -0,0 +1,46 @@ + + + + + + + Case Teams - Search + crm.team + + + + + + + + + + crm.team.form + crm.team + + + + + + + + + + + + crm.team.tree + crm.team + + + + + + + + + + From 7f06638adafe4687280f0bb25ba222e65d4b0f4f Mon Sep 17 00:00:00 2001 From: lreficent Date: Thu, 26 Jan 2017 14:21:05 +0100 Subject: [PATCH 02/39] sales_team_operating_unit to v10.0 --- sales_team_operating_unit/__init__.py | 2 +- sales_team_operating_unit/__openerp__.py | 4 +- sales_team_operating_unit/models/__init__.py | 2 +- sales_team_operating_unit/models/crm_team.py | 2 +- .../security/crm_security.xml | 28 ++++---- sales_team_operating_unit/tests/__init__.py | 2 +- .../tests/test_crm_team_operating_unit.py | 2 +- .../views/crm_team_view.xml | 72 +++++++++---------- 8 files changed, 55 insertions(+), 59 deletions(-) diff --git a/sales_team_operating_unit/__init__.py b/sales_team_operating_unit/__init__.py index b6f6916a4a..52a8217c8c 100644 --- a/sales_team_operating_unit/__init__.py +++ b/sales_team_operating_unit/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016-17 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from . import models diff --git a/sales_team_operating_unit/__openerp__.py b/sales_team_operating_unit/__openerp__.py index 7750bffec6..c534f28338 100644 --- a/sales_team_operating_unit/__openerp__.py +++ b/sales_team_operating_unit/__openerp__.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- -# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016-17 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). { "name": "Sales Team Operating Unit", - "version": "9.0.1.0.0", + "version": "10.0.1.0.0", "author": "Eficent, " "Serpent Consulting Services Pvt. Ltd.," "Odoo Community Association (OCA)", diff --git a/sales_team_operating_unit/models/__init__.py b/sales_team_operating_unit/models/__init__.py index 57b4906011..1a07a2775f 100644 --- a/sales_team_operating_unit/models/__init__.py +++ b/sales_team_operating_unit/models/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016-17 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from . import crm_team diff --git a/sales_team_operating_unit/models/crm_team.py b/sales_team_operating_unit/models/crm_team.py index bbb5300c7d..7d62c5e4d4 100644 --- a/sales_team_operating_unit/models/crm_team.py +++ b/sales_team_operating_unit/models/crm_team.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2015 Eficent Business and IT Consulting Services S.L. +# © 2015-17 Eficent Business and IT Consulting Services S.L. # © 2015 Serpent Consulting Services Pvt. Ltd. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from openerp import fields, models diff --git a/sales_team_operating_unit/security/crm_security.xml b/sales_team_operating_unit/security/crm_security.xml index 54a11eb6dd..a248e88869 100644 --- a/sales_team_operating_unit/security/crm_security.xml +++ b/sales_team_operating_unit/security/crm_security.xml @@ -1,20 +1,18 @@ - - - + - - - ['|',('operating_unit_id','=',False),('operating_unit_id','in',[g.id for g in user.operating_unit_ids])] - Sales Teams from allowed operating units - - - - - - + + + ['|',('operating_unit_id','=',False),('operating_unit_id','in',[g.id for g in user.operating_unit_ids])] + Sales Teams from allowed operating units + + + + + + - diff --git a/sales_team_operating_unit/tests/__init__.py b/sales_team_operating_unit/tests/__init__.py index 4254efc93e..bae24db98d 100644 --- a/sales_team_operating_unit/tests/__init__.py +++ b/sales_team_operating_unit/tests/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016-17 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from . import test_crm_team_operating_unit diff --git a/sales_team_operating_unit/tests/test_crm_team_operating_unit.py b/sales_team_operating_unit/tests/test_crm_team_operating_unit.py index aaec15871d..4dc560ee1e 100644 --- a/sales_team_operating_unit/tests/test_crm_team_operating_unit.py +++ b/sales_team_operating_unit/tests/test_crm_team_operating_unit.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2016 Eficent Business and IT Consulting Services S.L. +# © 2016-17 Eficent Business and IT Consulting Services S.L. # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from openerp.tests import common diff --git a/sales_team_operating_unit/views/crm_team_view.xml b/sales_team_operating_unit/views/crm_team_view.xml index fda6cd5233..02f543a90f 100644 --- a/sales_team_operating_unit/views/crm_team_view.xml +++ b/sales_team_operating_unit/views/crm_team_view.xml @@ -1,46 +1,44 @@ - - + - - Case Teams - Search - crm.team - - - - - + + Case Teams - Search + crm.team + + + + - + + - - crm.team.form - crm.team - - - - - - - - - + + crm.team.form + crm.team + + + + + + + + + - - crm.team.tree - crm.team - - - - - + + crm.team.tree + crm.team + + + + - + + - - + From f88ee2751bcb525eb5da713a285f3eceef410b42 Mon Sep 17 00:00:00 2001 From: darshan-serpent Date: Fri, 27 Jan 2017 17:09:36 +0530 Subject: [PATCH 03/39] test cases and other changes --- sales_team_operating_unit/README.rst | 3 +- sales_team_operating_unit/__init__.py | 6 +- .../{__openerp__.py => __manifest__.py} | 10 +-- sales_team_operating_unit/models/__init__.py | 6 +- sales_team_operating_unit/models/crm_team.py | 21 ++++-- .../security/crm_security.xml | 27 +++---- sales_team_operating_unit/tests/__init__.py | 5 +- .../tests/test_crm_team_operating_unit.py | 33 +++++---- .../views/crm_team_view.xml | 71 ++++++++++--------- 9 files changed, 105 insertions(+), 77 deletions(-) rename sales_team_operating_unit/{__openerp__.py => __manifest__.py} (62%) diff --git a/sales_team_operating_unit/README.rst b/sales_team_operating_unit/README.rst index 7510a26cf8..d15eb89302 100644 --- a/sales_team_operating_unit/README.rst +++ b/sales_team_operating_unit/README.rst @@ -22,7 +22,7 @@ Usage .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/213/9.0 + :target: https://runbot.odoo-community.org/runbot/213/10.0 Bug Tracker =========== @@ -44,6 +44,7 @@ Contributors ------------ * Jordi Ballester Alomar +* Serpent Consulting Services Pvt. Ltd. Maintainer ---------- diff --git a/sales_team_operating_unit/__init__.py b/sales_team_operating_unit/__init__.py index 52a8217c8c..e21bf71290 100644 --- a/sales_team_operating_unit/__init__.py +++ b/sales_team_operating_unit/__init__.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -# © 2016-17 Eficent Business and IT Consulting Services S.L. +# Copyright 2016-17 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. +# () # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). - from . import models diff --git a/sales_team_operating_unit/__openerp__.py b/sales_team_operating_unit/__manifest__.py similarity index 62% rename from sales_team_operating_unit/__openerp__.py rename to sales_team_operating_unit/__manifest__.py index c534f28338..dd757f2a2d 100644 --- a/sales_team_operating_unit/__openerp__.py +++ b/sales_team_operating_unit/__manifest__.py @@ -1,15 +1,17 @@ # -*- coding: utf-8 -*- -# © 2016-17 Eficent Business and IT Consulting Services S.L. +# Copyright 2016-17 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. +# () # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). - { "name": "Sales Team Operating Unit", "version": "10.0.1.0.0", "author": "Eficent, " - "Serpent Consulting Services Pvt. Ltd.," + "SerpentCS," "Odoo Community Association (OCA)", "license": "LGPL-3", - "website": "http://www.eficent.com", + "website": "https://github.com/OCA/operating-unit", "category": "Sales", "depends": ["sales_team", "operating_unit"], "data": [ diff --git a/sales_team_operating_unit/models/__init__.py b/sales_team_operating_unit/models/__init__.py index 1a07a2775f..e4c6d9e05c 100644 --- a/sales_team_operating_unit/models/__init__.py +++ b/sales_team_operating_unit/models/__init__.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -# © 2016-17 Eficent Business and IT Consulting Services S.L. +# Copyright 2016-17 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. +# () # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). - from . import crm_team diff --git a/sales_team_operating_unit/models/crm_team.py b/sales_team_operating_unit/models/crm_team.py index 7d62c5e4d4..4facee5413 100644 --- a/sales_team_operating_unit/models/crm_team.py +++ b/sales_team_operating_unit/models/crm_team.py @@ -1,11 +1,14 @@ # -*- coding: utf-8 -*- -# © 2015-17 Eficent Business and IT Consulting Services S.L. -# © 2015 Serpent Consulting Services Pvt. Ltd. +# Copyright 2016-17 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. +# () # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from openerp import fields, models +from odoo import api, fields, models, _ +from odoo.exceptions import UserError -class CRMTeam(models.Model): +class CrmTeam(models.Model): _inherit = 'crm.team' @@ -13,3 +16,13 @@ class CRMTeam(models.Model): default=lambda self: self.env['res.users']. operating_unit_default_get(self._uid)) + + @api.multi + @api.constrains('operating_unit_id', 'company_id') + def _check_company_operating_unit(self): + for team in self: + if team.company_id and \ + team.operating_unit_id and \ + team.company_id != team.operating_unit_id.company_id: + raise UserError(_('Configuration error!\n\nThe Company in the\ + Sales Team and in the Operating Unit must be the same.')) diff --git a/sales_team_operating_unit/security/crm_security.xml b/sales_team_operating_unit/security/crm_security.xml index a248e88869..b9b48c55fe 100644 --- a/sales_team_operating_unit/security/crm_security.xml +++ b/sales_team_operating_unit/security/crm_security.xml @@ -1,18 +1,21 @@ - + + - - - ['|',('operating_unit_id','=',False),('operating_unit_id','in',[g.id for g in user.operating_unit_ids])] - Sales Teams from allowed operating units - - - - - - + + + ['|',('operating_unit_id','=',False),('operating_unit_id','in',[g.id for g in user.operating_unit_ids])] + Sales Teams from allowed operating units + + + + + + + diff --git a/sales_team_operating_unit/tests/__init__.py b/sales_team_operating_unit/tests/__init__.py index bae24db98d..2ba66845e4 100644 --- a/sales_team_operating_unit/tests/__init__.py +++ b/sales_team_operating_unit/tests/__init__.py @@ -1,5 +1,8 @@ # -*- coding: utf-8 -*- -# © 2016-17 Eficent Business and IT Consulting Services S.L. +# Copyright 2016-17 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. +# () # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from . import test_crm_team_operating_unit diff --git a/sales_team_operating_unit/tests/test_crm_team_operating_unit.py b/sales_team_operating_unit/tests/test_crm_team_operating_unit.py index 4dc560ee1e..29b4d3ff3c 100644 --- a/sales_team_operating_unit/tests/test_crm_team_operating_unit.py +++ b/sales_team_operating_unit/tests/test_crm_team_operating_unit.py @@ -1,8 +1,11 @@ # -*- coding: utf-8 -*- -# © 2016-17 Eficent Business and IT Consulting Services S.L. +# Copyright 2016-17 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. +# () # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). - -from openerp.tests import common +from odoo.tests import common +from odoo.exceptions import UserError class TestSaleTeamOperatingUnit(common.TransactionCase): @@ -10,9 +13,9 @@ class TestSaleTeamOperatingUnit(common.TransactionCase): def setUp(self): super(TestSaleTeamOperatingUnit, self).setUp() self.res_users_model = self.env['res.users'] - self.crm_team_model = self.registry('crm.team') + self.crm_team_model = self.env['crm.team'] # Groups - self.grp_sale_mngr = self.env.ref('base.group_sale_manager') + self.grp_sale_mngr = self.env.ref('sales_team.group_sale_manager') self.grp_user = self.env.ref('base.group_user') # Company self.company = self.env.ref('base.main_company') @@ -49,21 +52,17 @@ def _create_user(self, login, groups, company, operating_units, return user def _create_crm_team(self, uid, operating_unit): - """Create a sale order.""" - context = {'mail_create_nosubscribe': True} - crm = self.crm_team_model.create(self.cr, uid, - {'name': 'CRM team', - 'operating_unit_id': - operating_unit.id}, - context=context) + """Create a Sales Team.""" + crm = self.crm_team_model.sudo(uid).create({'name': 'CRM team', + 'operating_unit_id': + operating_unit.id}) return crm def test_crm_team(self): # User 2 is only assigned to B2C Operating Unit, and cannot # access CRM teams for Main Operating Unit. - - team = self.crm_team_model.search( - self.cr, self.user2.id, [('id', '=', self.team1), - ('operating_unit_id', '=', self.ou1.id)]) - self.assertEqual(team, [], 'User 2 should not have access to ' + team = self.crm_team_model.sudo(self.user2.id).\ + search([('id', '=', self.team1.id), + ('operating_unit_id', '=', self.ou1.id)]) + self.assertEqual(team.ids, [], 'User 2 should not have access to ' '%s' % self.ou1.name) diff --git a/sales_team_operating_unit/views/crm_team_view.xml b/sales_team_operating_unit/views/crm_team_view.xml index 02f543a90f..432ed4d886 100644 --- a/sales_team_operating_unit/views/crm_team_view.xml +++ b/sales_team_operating_unit/views/crm_team_view.xml @@ -1,44 +1,47 @@ - + - - Case Teams - Search - crm.team - - - - + + Case Teams - Search + crm.team + + + + + - - + - - crm.team.form - crm.team - - - - - - - - - + + crm.team.form + crm.team + + + + + + + + + - - crm.team.tree - crm.team - - - - + + crm.team.tree + crm.team + + + + + - - + + From 3df65eddb48934c249e541ebe7aa6a58012edea8 Mon Sep 17 00:00:00 2001 From: lreficent Date: Fri, 27 Jan 2017 13:44:50 +0100 Subject: [PATCH 04/39] remove unused import. --- sales_team_operating_unit/tests/test_crm_team_operating_unit.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sales_team_operating_unit/tests/test_crm_team_operating_unit.py b/sales_team_operating_unit/tests/test_crm_team_operating_unit.py index 29b4d3ff3c..671e7e9ac9 100644 --- a/sales_team_operating_unit/tests/test_crm_team_operating_unit.py +++ b/sales_team_operating_unit/tests/test_crm_team_operating_unit.py @@ -5,7 +5,6 @@ # () # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from odoo.tests import common -from odoo.exceptions import UserError class TestSaleTeamOperatingUnit(common.TransactionCase): From 3cef3592f88dbbb1fb50b746bc2e511e0213fc50 Mon Sep 17 00:00:00 2001 From: mreficent Date: Fri, 27 Jan 2017 16:20:37 +0100 Subject: [PATCH 05/39] removing tags --- .../security/crm_security.xml | 26 ++++--- .../views/crm_team_view.xml | 68 +++++++++---------- 2 files changed, 45 insertions(+), 49 deletions(-) diff --git a/sales_team_operating_unit/security/crm_security.xml b/sales_team_operating_unit/security/crm_security.xml index b9b48c55fe..c5474b8d4d 100644 --- a/sales_team_operating_unit/security/crm_security.xml +++ b/sales_team_operating_unit/security/crm_security.xml @@ -2,20 +2,18 @@ - - + - - - ['|',('operating_unit_id','=',False),('operating_unit_id','in',[g.id for g in user.operating_unit_ids])] - Sales Teams from allowed operating units - - - - - - + + + ['|',('operating_unit_id','=',False),('operating_unit_id','in',[g.id for g in user.operating_unit_ids])] + Sales Teams from allowed operating units + + + + + + - diff --git a/sales_team_operating_unit/views/crm_team_view.xml b/sales_team_operating_unit/views/crm_team_view.xml index 432ed4d886..c8d9e17f9d 100644 --- a/sales_team_operating_unit/views/crm_team_view.xml +++ b/sales_team_operating_unit/views/crm_team_view.xml @@ -3,45 +3,43 @@ Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) --> - - - Case Teams - Search - crm.team - - - - - + + Case Teams - Search + crm.team + + + + - + + - - crm.team.form - crm.team - - - - - - - - - + + crm.team.form + crm.team + + + + + + + + + - - crm.team.tree - crm.team - - - - - + + crm.team.tree + crm.team + + + + - + + - From 02652a9be0f8b26d489a314a80f8b2484e097b04 Mon Sep 17 00:00:00 2001 From: Graeme Gellatly Date: Fri, 3 Nov 2017 16:29:15 +1300 Subject: [PATCH 06/39] Port sales team operating unit - Remove encodings - Bump Version - Fix form view to place under company_id - Test - Fix security rules --- sales_team_operating_unit/README.rst | 2 +- sales_team_operating_unit/__init__.py | 1 - sales_team_operating_unit/__manifest__.py | 3 +-- sales_team_operating_unit/models/__init__.py | 1 - sales_team_operating_unit/models/crm_team.py | 19 +++++++++---------- .../security/crm_security.xml | 4 ++-- sales_team_operating_unit/tests/__init__.py | 1 - .../tests/test_crm_team_operating_unit.py | 4 ++-- .../views/crm_team_view.xml | 13 +++++-------- 9 files changed, 20 insertions(+), 28 deletions(-) diff --git a/sales_team_operating_unit/README.rst b/sales_team_operating_unit/README.rst index d15eb89302..437f5da3e9 100644 --- a/sales_team_operating_unit/README.rst +++ b/sales_team_operating_unit/README.rst @@ -22,7 +22,7 @@ Usage .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/213/10.0 + :target: https://runbot.odoo-community.org/runbot/213/11.0 Bug Tracker =========== diff --git a/sales_team_operating_unit/__init__.py b/sales_team_operating_unit/__init__.py index e21bf71290..b33b1f8e4f 100644 --- a/sales_team_operating_unit/__init__.py +++ b/sales_team_operating_unit/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016-17 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. diff --git a/sales_team_operating_unit/__manifest__.py b/sales_team_operating_unit/__manifest__.py index dd757f2a2d..958f4dee39 100644 --- a/sales_team_operating_unit/__manifest__.py +++ b/sales_team_operating_unit/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016-17 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. @@ -6,7 +5,7 @@ # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). { "name": "Sales Team Operating Unit", - "version": "10.0.1.0.0", + "version": "11.0.1.0.0", "author": "Eficent, " "SerpentCS," "Odoo Community Association (OCA)", diff --git a/sales_team_operating_unit/models/__init__.py b/sales_team_operating_unit/models/__init__.py index e4c6d9e05c..11a1211eb1 100644 --- a/sales_team_operating_unit/models/__init__.py +++ b/sales_team_operating_unit/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016-17 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. diff --git a/sales_team_operating_unit/models/crm_team.py b/sales_team_operating_unit/models/crm_team.py index 4facee5413..f166b7a1a7 100644 --- a/sales_team_operating_unit/models/crm_team.py +++ b/sales_team_operating_unit/models/crm_team.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016-17 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. @@ -12,17 +11,17 @@ class CrmTeam(models.Model): _inherit = 'crm.team' - operating_unit_id = fields.Many2one('operating.unit', 'Operating Unit', - default=lambda self: - self.env['res.users']. - operating_unit_default_get(self._uid)) + operating_unit_id = fields.Many2one( + 'operating.unit', 'Operating Unit', + default=lambda self: self.env['res.users'].operating_unit_default_get() + ) @api.multi @api.constrains('operating_unit_id', 'company_id') def _check_company_operating_unit(self): for team in self: - if team.company_id and \ - team.operating_unit_id and \ - team.company_id != team.operating_unit_id.company_id: - raise UserError(_('Configuration error!\n\nThe Company in the\ - Sales Team and in the Operating Unit must be the same.')) + if (team.company_id and team.operating_unit_id and + team.company_id != team.operating_unit_id.company_id): + raise UserError(_('Configuration error!\n\n' + 'The Company in the Sales Team and in the ' + 'Operating Unit must be the same.')) diff --git a/sales_team_operating_unit/security/crm_security.xml b/sales_team_operating_unit/security/crm_security.xml index c5474b8d4d..ca4cfcf331 100644 --- a/sales_team_operating_unit/security/crm_security.xml +++ b/sales_team_operating_unit/security/crm_security.xml @@ -2,12 +2,12 @@ - + - ['|',('operating_unit_id','=',False),('operating_unit_id','in',[g.id for g in user.operating_unit_ids])] + ['|',('operating_unit_id','=',False),('operating_unit_id','in', user.operating_unit_ids.ids)] Sales Teams from allowed operating units diff --git a/sales_team_operating_unit/tests/__init__.py b/sales_team_operating_unit/tests/__init__.py index 2ba66845e4..4bdc28927c 100644 --- a/sales_team_operating_unit/tests/__init__.py +++ b/sales_team_operating_unit/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016-17 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. diff --git a/sales_team_operating_unit/tests/test_crm_team_operating_unit.py b/sales_team_operating_unit/tests/test_crm_team_operating_unit.py index 671e7e9ac9..8917757e6d 100644 --- a/sales_team_operating_unit/tests/test_crm_team_operating_unit.py +++ b/sales_team_operating_unit/tests/test_crm_team_operating_unit.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016-17 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. @@ -11,7 +10,8 @@ class TestSaleTeamOperatingUnit(common.TransactionCase): def setUp(self): super(TestSaleTeamOperatingUnit, self).setUp() - self.res_users_model = self.env['res.users'] + self.res_users_model = self.env['res.users'].with_context( + tracking_disable=True, no_reset_password=True) self.crm_team_model = self.env['crm.team'] # Groups self.grp_sale_mngr = self.env.ref('sales_team.group_sale_manager') diff --git a/sales_team_operating_unit/views/crm_team_view.xml b/sales_team_operating_unit/views/crm_team_view.xml index c8d9e17f9d..b13135176d 100644 --- a/sales_team_operating_unit/views/crm_team_view.xml +++ b/sales_team_operating_unit/views/crm_team_view.xml @@ -7,8 +7,7 @@ Case Teams - Search crm.team - + @@ -21,12 +20,10 @@ crm.team - - - - - + + + From d044d0c696c8e8c5a7b5d74b6a0b00fc4a476e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Be=C3=B1at=20Jimenez?= Date: Thu, 22 Nov 2018 09:04:19 +0100 Subject: [PATCH 07/39] sales_team_operating_unit to version 12 --- sales_team_operating_unit/README.rst | 66 ++- sales_team_operating_unit/__init__.py | 5 +- sales_team_operating_unit/__manifest__.py | 4 +- sales_team_operating_unit/models/__init__.py | 5 +- sales_team_operating_unit/models/crm_team.py | 2 +- .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 9 + sales_team_operating_unit/readme/USAGE.rst | 1 + .../security/crm_security.xml | 4 +- .../static/description/index.html | 433 ++++++++++++++++++ sales_team_operating_unit/tests/__init__.py | 4 - .../tests/test_crm_team_operating_unit.py | 11 +- .../views/crm_team_view.xml | 4 +- 13 files changed, 507 insertions(+), 43 deletions(-) create mode 100644 sales_team_operating_unit/readme/CONTRIBUTORS.rst create mode 100644 sales_team_operating_unit/readme/DESCRIPTION.rst create mode 100644 sales_team_operating_unit/readme/USAGE.rst create mode 100644 sales_team_operating_unit/static/description/index.html diff --git a/sales_team_operating_unit/README.rst b/sales_team_operating_unit/README.rst index 437f5da3e9..17f192f6b6 100644 --- a/sales_team_operating_unit/README.rst +++ b/sales_team_operating_unit/README.rst @@ -1,11 +1,30 @@ -.. image:: https://img.shields.io/badge/license-LGPLv3-blue.svg - :target: https://www.gnu.org/licenses/lgpl.html - :alt: License: LGPL-3 - ========================= Sales Team Operating Unit ========================= +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Foperating--unit-lightgray.png?logo=github + :target: https://github.com/OCA/operating-unit/tree/12.0/sales_team_operating_unit + :alt: OCA/operating-unit +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/operating-unit-12-0/operating-unit-12-0-sales_team_operating_unit + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/213/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + This module introduces the following features: * Adds the Operating Unit (OU) to the Sales Team. @@ -16,47 +35,54 @@ This module introduces the following features: * Security rules are defined to ensure that users can only see the Sales Team of that Operating Units in which they are allowed access to. +**Table of contents** + +.. contents:: + :local: Usage ===== -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/213/11.0 +Add the operating unit to sales team Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed feedback. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Eficent +* SerpentCS Contributors ------------- +~~~~~~~~~~~~ * Jordi Ballester Alomar * Serpent Consulting Services Pvt. Ltd. -Maintainer ----------- +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/operating-unit `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sales_team_operating_unit/__init__.py b/sales_team_operating_unit/__init__.py index b33b1f8e4f..44f9fd7c13 100644 --- a/sales_team_operating_unit/__init__.py +++ b/sales_team_operating_unit/__init__.py @@ -1,6 +1,3 @@ -# Copyright 2016-17 Eficent Business and IT Consulting Services S.L. -# (http://www.eficent.com) -# Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. -# () # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + from . import models diff --git a/sales_team_operating_unit/__manifest__.py b/sales_team_operating_unit/__manifest__.py index 958f4dee39..f90c35ae41 100644 --- a/sales_team_operating_unit/__manifest__.py +++ b/sales_team_operating_unit/__manifest__.py @@ -5,7 +5,7 @@ # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). { "name": "Sales Team Operating Unit", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "author": "Eficent, " "SerpentCS," "Odoo Community Association (OCA)", @@ -14,8 +14,8 @@ "category": "Sales", "depends": ["sales_team", "operating_unit"], "data": [ - "views/crm_team_view.xml", "security/crm_security.xml", + "views/crm_team_view.xml", ], 'installable': True, } diff --git a/sales_team_operating_unit/models/__init__.py b/sales_team_operating_unit/models/__init__.py index 11a1211eb1..cbef6fad34 100644 --- a/sales_team_operating_unit/models/__init__.py +++ b/sales_team_operating_unit/models/__init__.py @@ -1,6 +1,3 @@ -# Copyright 2016-17 Eficent Business and IT Consulting Services S.L. -# (http://www.eficent.com) -# Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. -# () # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + from . import crm_team diff --git a/sales_team_operating_unit/models/crm_team.py b/sales_team_operating_unit/models/crm_team.py index f166b7a1a7..9c0e4c023b 100644 --- a/sales_team_operating_unit/models/crm_team.py +++ b/sales_team_operating_unit/models/crm_team.py @@ -22,6 +22,6 @@ def _check_company_operating_unit(self): for team in self: if (team.company_id and team.operating_unit_id and team.company_id != team.operating_unit_id.company_id): - raise UserError(_('Configuration error!\n\n' + raise UserError(_('Configuration error, ' 'The Company in the Sales Team and in the ' 'Operating Unit must be the same.')) diff --git a/sales_team_operating_unit/readme/CONTRIBUTORS.rst b/sales_team_operating_unit/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..03b3be1734 --- /dev/null +++ b/sales_team_operating_unit/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Jordi Ballester Alomar +* Serpent Consulting Services Pvt. Ltd. diff --git a/sales_team_operating_unit/readme/DESCRIPTION.rst b/sales_team_operating_unit/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..26f0446b92 --- /dev/null +++ b/sales_team_operating_unit/readme/DESCRIPTION.rst @@ -0,0 +1,9 @@ +This module introduces the following features: + +* Adds the Operating Unit (OU) to the Sales Team. + +* The user's default Operating Unit (OU) is proposed at the time of creating + the Sales Team. + +* Security rules are defined to ensure that users can only see the Sales Team + of that Operating Units in which they are allowed access to. diff --git a/sales_team_operating_unit/readme/USAGE.rst b/sales_team_operating_unit/readme/USAGE.rst new file mode 100644 index 0000000000..20149499eb --- /dev/null +++ b/sales_team_operating_unit/readme/USAGE.rst @@ -0,0 +1 @@ +Add the operating unit to sales team diff --git a/sales_team_operating_unit/security/crm_security.xml b/sales_team_operating_unit/security/crm_security.xml index ca4cfcf331..37f569860a 100644 --- a/sales_team_operating_unit/security/crm_security.xml +++ b/sales_team_operating_unit/security/crm_security.xml @@ -2,18 +2,18 @@ - + ['|',('operating_unit_id','=',False),('operating_unit_id','in', user.operating_unit_ids.ids)] Sales Teams from allowed operating units - + diff --git a/sales_team_operating_unit/static/description/index.html b/sales_team_operating_unit/static/description/index.html new file mode 100644 index 0000000000..87e05a4c9f --- /dev/null +++ b/sales_team_operating_unit/static/description/index.html @@ -0,0 +1,433 @@ + + + + + + +Sales Team Operating Unit + + + +
+

Sales Team Operating Unit

+ + +

Beta License: LGPL-3 OCA/operating-unit Translate me on Weblate Try me on Runbot

+

This module introduces the following features:

+
    +
  • Adds the Operating Unit (OU) to the Sales Team.
    • +
  • The user’s default Operating Unit (OU) is proposed at the time of creating +the Sales Team.
    • +
  • Security rules are defined to ensure that users can only see the Sales Team +of that Operating Units in which they are allowed access to.
    • +
+

Table of contents

+ +
+

Usage

+

Add the operating unit to sales team

+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Eficent
    • +
  • SerpentCS
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/operating-unit project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/sales_team_operating_unit/tests/__init__.py b/sales_team_operating_unit/tests/__init__.py index 4bdc28927c..f7d19800c2 100644 --- a/sales_team_operating_unit/tests/__init__.py +++ b/sales_team_operating_unit/tests/__init__.py @@ -1,7 +1,3 @@ -# Copyright 2016-17 Eficent Business and IT Consulting Services S.L. -# (http://www.eficent.com) -# Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. -# () # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from . import test_crm_team_operating_unit diff --git a/sales_team_operating_unit/tests/test_crm_team_operating_unit.py b/sales_team_operating_unit/tests/test_crm_team_operating_unit.py index 8917757e6d..92aa365e60 100644 --- a/sales_team_operating_unit/tests/test_crm_team_operating_unit.py +++ b/sales_team_operating_unit/tests/test_crm_team_operating_unit.py @@ -15,7 +15,8 @@ def setUp(self): self.crm_team_model = self.env['crm.team'] # Groups self.grp_sale_mngr = self.env.ref('sales_team.group_sale_manager') - self.grp_user = self.env.ref('base.group_user') + self.grp_user = self.env.ref( + 'operating_unit.group_multi_operating_unit') # Company self.company = self.env.ref('base.main_company') # Main Operating Unit @@ -23,6 +24,7 @@ def setUp(self): # B2C Operating Unit self.b2c = self.env.ref('operating_unit.b2c_operating_unit') # Create User 1 with Main OU + self.user1 = self._create_user('user_1', [self.grp_sale_mngr, self.grp_user], self.company, [self.ou1]) @@ -52,9 +54,10 @@ def _create_user(self, login, groups, company, operating_units, def _create_crm_team(self, uid, operating_unit): """Create a Sales Team.""" - crm = self.crm_team_model.sudo(uid).create({'name': 'CRM team', - 'operating_unit_id': - operating_unit.id}) + crm = self.crm_team_model.sudo(uid).create( + {'name': 'CRM team', + 'operating_unit_id': operating_unit.id, + 'company_id': self.company.id}) return crm def test_crm_team(self): diff --git a/sales_team_operating_unit/views/crm_team_view.xml b/sales_team_operating_unit/views/crm_team_view.xml index b13135176d..17fa3479d2 100644 --- a/sales_team_operating_unit/views/crm_team_view.xml +++ b/sales_team_operating_unit/views/crm_team_view.xml @@ -20,10 +20,10 @@ crm.team - + - + From 7a3857c1329673cd575f977ea4dc5bcb4a82eb5d Mon Sep 17 00:00:00 2001 From: aheficent Date: Fri, 30 Nov 2018 11:43:56 +0100 Subject: [PATCH 08/39] domain for operating_unit sales_team --- sales_team_operating_unit/__manifest__.py | 2 +- sales_team_operating_unit/views/crm_team_view.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sales_team_operating_unit/__manifest__.py b/sales_team_operating_unit/__manifest__.py index f90c35ae41..7ec02bcb8e 100644 --- a/sales_team_operating_unit/__manifest__.py +++ b/sales_team_operating_unit/__manifest__.py @@ -5,7 +5,7 @@ # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). { "name": "Sales Team Operating Unit", - "version": "12.0.1.0.0", + "version": "12.0.1.1.0", "author": "Eficent, " "SerpentCS," "Odoo Community Association (OCA)", diff --git a/sales_team_operating_unit/views/crm_team_view.xml b/sales_team_operating_unit/views/crm_team_view.xml index 17fa3479d2..14f45adec6 100644 --- a/sales_team_operating_unit/views/crm_team_view.xml +++ b/sales_team_operating_unit/views/crm_team_view.xml @@ -22,7 +22,8 @@ + domain="[('company_id','=', company_id), + ('user_ids', 'in', uid)]" options="{'no_create': True}"/> From 1e0cb6d8d52506df471e75b0eb61d70c0cbab659 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 29 Jul 2019 03:23:48 +0000 Subject: [PATCH 09/39] README.rst --- sales_team_operating_unit/static/description/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sales_team_operating_unit/static/description/index.html b/sales_team_operating_unit/static/description/index.html index 87e05a4c9f..62c65fae23 100644 --- a/sales_team_operating_unit/static/description/index.html +++ b/sales_team_operating_unit/static/description/index.html @@ -3,7 +3,7 @@ - + Sales Team Operating Unit