From 82f3ee064c7858649dee38f5a2ffdf0018553aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 2 Feb 2022 08:37:29 +0000 Subject: [PATCH] [MOV] website_crm_partner_assign: split models and views into separate files Give a little coup de jeune to this module by reorganizing models and views into separate files. Task-2752043 Part-of: odoo/odoo#83806 --- .../__manifest__.py | 3 + .../models/__init__.py | 2 + .../models/res_partner.py | 31 ----- .../models/res_partner_activation.py | 13 ++ .../models/res_partner_grade.py | 26 ++++ .../views/partner_assign_menus.xml | 19 +++ .../views/res_partner_activation_views.xml | 40 ++++++ .../views/res_partner_grade_views.xml | 63 ++++++++++ .../views/res_partner_views.xml | 115 ------------------ 9 files changed, 166 insertions(+), 146 deletions(-) create mode 100644 addons/website_crm_partner_assign/models/res_partner_activation.py create mode 100644 addons/website_crm_partner_assign/models/res_partner_grade.py create mode 100644 addons/website_crm_partner_assign/views/partner_assign_menus.xml create mode 100644 addons/website_crm_partner_assign/views/res_partner_activation_views.xml create mode 100644 addons/website_crm_partner_assign/views/res_partner_grade_views.xml diff --git a/addons/website_crm_partner_assign/__manifest__.py b/addons/website_crm_partner_assign/__manifest__.py index 0bd6dbba40c..02d58421a86 100644 --- a/addons/website_crm_partner_assign/__manifest__.py +++ b/addons/website_crm_partner_assign/__manifest__.py @@ -33,8 +33,11 @@ The automatic assignment is figured from the weight of partner levels and the ge 'security/ir_rule.xml', 'wizard/crm_forward_to_partner_view.xml', 'views/res_partner_views.xml', + 'views/res_partner_activation_views.xml', + 'views/res_partner_grade_views.xml', 'views/crm_lead_views.xml', 'views/website_crm_partner_assign_templates.xml', + 'views/partner_assign_menus.xml', 'report/crm_partner_report_view.xml', ], 'demo': [ diff --git a/addons/website_crm_partner_assign/models/__init__.py b/addons/website_crm_partner_assign/models/__init__.py index f5fb173f8f5..106f31c91a7 100644 --- a/addons/website_crm_partner_assign/models/__init__.py +++ b/addons/website_crm_partner_assign/models/__init__.py @@ -3,4 +3,6 @@ from . import crm_lead from . import res_partner +from . import res_partner_activation +from . import res_partner_grade from . import website diff --git a/addons/website_crm_partner_assign/models/res_partner.py b/addons/website_crm_partner_assign/models/res_partner.py index 47b076024bf..3d5fffab4d6 100644 --- a/addons/website_crm_partner_assign/models/res_partner.py +++ b/addons/website_crm_partner_assign/models/res_partner.py @@ -3,37 +3,6 @@ from odoo import api, fields, models from odoo.osv import expression -from odoo.addons.http_routing.models.ir_http import slug - - -class ResPartnerGrade(models.Model): - _name = 'res.partner.grade' - _order = 'sequence desc' - _inherit = ['website.published.mixin'] - _description = 'Partner Grade' - - sequence = fields.Integer('Sequence') - active = fields.Boolean('Active', default=lambda *args: 1) - name = fields.Char('Level Name', translate=True) - partner_weight = fields.Integer('Level Weight', default=1, - help="Gives the probability to assign a lead to this partner. (0 means no assignment.)") - - def _compute_website_url(self): - super(ResPartnerGrade, self)._compute_website_url() - for grade in self: - grade.website_url = "/partners/grade/%s" % (slug(grade)) - - def _default_is_published(self): - return True - - -class ResPartnerActivation(models.Model): - _name = 'res.partner.activation' - _order = 'sequence desc' - _description = 'Partner Activation' - - sequence = fields.Integer('Sequence') - name = fields.Char('Name', required=True) class ResPartner(models.Model): diff --git a/addons/website_crm_partner_assign/models/res_partner_activation.py b/addons/website_crm_partner_assign/models/res_partner_activation.py new file mode 100644 index 00000000000..aac9ebde8fd --- /dev/null +++ b/addons/website_crm_partner_assign/models/res_partner_activation.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models + + +class ResPartnerActivation(models.Model): + _name = 'res.partner.activation' + _order = 'sequence desc' + _description = 'Partner Activation' + + sequence = fields.Integer('Sequence') + name = fields.Char('Name', required=True) diff --git a/addons/website_crm_partner_assign/models/res_partner_grade.py b/addons/website_crm_partner_assign/models/res_partner_grade.py new file mode 100644 index 00000000000..373e5c4e14f --- /dev/null +++ b/addons/website_crm_partner_assign/models/res_partner_grade.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models +from odoo.addons.http_routing.models.ir_http import slug + + +class ResPartnerGrade(models.Model): + _name = 'res.partner.grade' + _order = 'sequence desc' + _inherit = ['website.published.mixin'] + _description = 'Partner Grade' + + sequence = fields.Integer('Sequence') + active = fields.Boolean('Active', default=lambda *args: 1) + name = fields.Char('Level Name', translate=True) + partner_weight = fields.Integer('Level Weight', default=1, + help="Gives the probability to assign a lead to this partner. (0 means no assignment.)") + + def _compute_website_url(self): + super(ResPartnerGrade, self)._compute_website_url() + for grade in self: + grade.website_url = "/partners/grade/%s" % (slug(grade)) + + def _default_is_published(self): + return True diff --git a/addons/website_crm_partner_assign/views/partner_assign_menus.xml b/addons/website_crm_partner_assign/views/partner_assign_menus.xml new file mode 100644 index 00000000000..5aaff776d14 --- /dev/null +++ b/addons/website_crm_partner_assign/views/partner_assign_menus.xml @@ -0,0 +1,19 @@ + + + + + + + + + + diff --git a/addons/website_crm_partner_assign/views/res_partner_activation_views.xml b/addons/website_crm_partner_assign/views/res_partner_activation_views.xml new file mode 100644 index 00000000000..4f49f6cfbef --- /dev/null +++ b/addons/website_crm_partner_assign/views/res_partner_activation_views.xml @@ -0,0 +1,40 @@ + + + + res.partner.activation.form + res.partner.activation + +
+ + + + + + +
+
+
+ + res.partner.activation.tree + res.partner.activation + + + + + + + + + + Partner Activations + res.partner.activation + tree,form + +

+ Create a Partner Activation +

+ Those are used to know where your Partners stand in your onboarding process. +

+
+
+
diff --git a/addons/website_crm_partner_assign/views/res_partner_grade_views.xml b/addons/website_crm_partner_assign/views/res_partner_grade_views.xml new file mode 100644 index 00000000000..489845be884 --- /dev/null +++ b/addons/website_crm_partner_assign/views/res_partner_grade_views.xml @@ -0,0 +1,63 @@ + + + + res.partner.grade.tree + res.partner.grade + + + + + + + + + + res.partner.grade.form + res.partner.grade + +
+ +
+ +
+
+
+ + + + + +
+
+
+
+ + + res.partner.grade.view.search + res.partner.grade + + + + + + + + + + + Partner Levels + res.partner.grade + + +

+ Create a Partner Level +

+ Partner Levels allow you to rank your Partners based on their performances. +

+
+
+
diff --git a/addons/website_crm_partner_assign/views/res_partner_views.xml b/addons/website_crm_partner_assign/views/res_partner_views.xml index 17b18fbc62c..d32ed1b1530 100644 --- a/addons/website_crm_partner_assign/views/res_partner_views.xml +++ b/addons/website_crm_partner_assign/views/res_partner_views.xml @@ -1,119 +1,5 @@ - - - - - - - res.partner.activation.form - res.partner.activation - -
- - - - - - -
-
-
- - res.partner.activation.tree - res.partner.activation - - - - - - - - - - Partner Activations - res.partner.activation - tree,form - -

- Create a Partner Activation -

- Those are used to know where your Partners stand in your onboarding process. -

-
-
- - - - - - - res.partner.grade.tree - res.partner.grade - - - - - - - - - - res.partner.grade.form - res.partner.grade - -
- -
- -
-
-
- - - - - -
-
-
-
- - - res.partner.grade.view.search - res.partner.grade - - - - - - - - - - - Partner Levels - res.partner.grade - - -

- Create a Partner Level -

- Partner Levels allow you to rank your Partners based on their performances. -

-
-
- - - - res.partner.geo.inherit.tree res.partner @@ -166,5 +52,4 @@ -