From 6b9f1f33b4df469ed2f00b9f3679c2a3a870987f Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Tue, 16 Feb 2021 09:52:49 +0000 Subject: [PATCH 1/3] [ADD] partner_tier_validation --- partner_tier_validation/README.rst | 92 +++++++++++++++++ partner_tier_validation/__init__.py | 3 + partner_tier_validation/__manifest__.py | 20 ++++ partner_tier_validation/models/__init__.py | 5 + partner_tier_validation/models/res_partner.py | 20 ++++ .../models/tier_validation.py | 53 ++++++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../views/res_partner_view.xml | 96 ++++++++++++++++++ 8 files changed, 289 insertions(+) create mode 100644 partner_tier_validation/README.rst create mode 100644 partner_tier_validation/__init__.py create mode 100644 partner_tier_validation/__manifest__.py create mode 100644 partner_tier_validation/models/__init__.py create mode 100644 partner_tier_validation/models/res_partner.py create mode 100644 partner_tier_validation/models/tier_validation.py create mode 100644 partner_tier_validation/static/description/icon.png create mode 100644 partner_tier_validation/views/res_partner_view.xml diff --git a/partner_tier_validation/README.rst b/partner_tier_validation/README.rst new file mode 100644 index 000000000..b6e7f63e6 --- /dev/null +++ b/partner_tier_validation/README.rst @@ -0,0 +1,92 @@ +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png + :target: https://www.gnu.org/licenses/agpl + :alt: License: AGPL-3 + +==================== +Partner Tier Validation +==================== + +This module extends the functionality of Partner to support a tier +validation process. + +Installation +============ + +This module depends on ``base_tier_validation``. You can find it at +`OCA/server-ux `_ + + +Configuration +============= + +To configure this module, you need to: + +#. Go to *Settings > Technical > Tier Validations > Tier Definition*. +#. Create as many tiers as you want for Contact model. +#. Example: + Definition Formula + Tier Definition Expression + # Available locals: + # - rec: current record + + [rec.state == New] + +Usage +===== + +To use this module, you need to: + +#. Create a Contact triggering at least one "Tier Definition". +#. Click on *Request Validation* button. +#. Under the tab *Reviews* have a look to pending reviews and their statuses. +#. Validator has to update Is Customer or Is Supplier or Both for this Contact to be usable on SO/PO. + +Additional features: + +* You can filter the Invoices requesting your review through the filter *Needs my + Review*. +* User with rights to confirm the Vendor Bill (validate all tiers that would + be generated) can directly do the operation, this is, there is no need for + her/him to request a validation. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/142/11.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 smash it by providing detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Antonio Yamuta + +Do not contact contributors directly about support or help with technical issues. + +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/partner_tier_validation/__init__.py b/partner_tier_validation/__init__.py new file mode 100644 index 000000000..31660d6a9 --- /dev/null +++ b/partner_tier_validation/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import models diff --git a/partner_tier_validation/__manifest__.py b/partner_tier_validation/__manifest__.py new file mode 100644 index 000000000..b3f724a7a --- /dev/null +++ b/partner_tier_validation/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2019 Open Source Integrators +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + "name": "Partner Tier Validation", + "summary": "Extends the functionality of Contacts to" + "support a tier validation process.", + "version": "12.0.1.0.0", + "category": "Contact", + "author": "Open Source Integrators, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": [ + "contacts", + "base_tier_validation", + ], + "data": [ + "views/res_partner_view.xml", + ], +} diff --git a/partner_tier_validation/models/__init__.py b/partner_tier_validation/models/__init__.py new file mode 100644 index 000000000..a415f52e7 --- /dev/null +++ b/partner_tier_validation/models/__init__.py @@ -0,0 +1,5 @@ +# Copyright 2019 Open Source Integrators +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import res_partner +from . import tier_validation diff --git a/partner_tier_validation/models/res_partner.py b/partner_tier_validation/models/res_partner.py new file mode 100644 index 000000000..2085f2c19 --- /dev/null +++ b/partner_tier_validation/models/res_partner.py @@ -0,0 +1,20 @@ +# Copyright 2019 Open Source Integrators +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models, fields + + +class ResPartner(models.Model): + _name = "res.partner" + _inherit = ['res.partner', 'tier.validation'] + _state_from = ['new', 'to approve'] + _state_to = ['approved'] + + # override core odoo to set default value to False + customer = fields.Boolean(string='Is a Customer', default=False, + help="Check this box if this contact is a customer. It can be selected in sales orders.") + + state = fields.Selection(selection=[('new','New'), + ('approved','Approved'),], + string='Status', + default='new' ) diff --git a/partner_tier_validation/models/tier_validation.py b/partner_tier_validation/models/tier_validation.py new file mode 100644 index 000000000..515e3549e --- /dev/null +++ b/partner_tier_validation/models/tier_validation.py @@ -0,0 +1,53 @@ +# Copyright 2019 Open Source Integrators +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import api, models, _ +from odoo.exceptions import ValidationError + +class TierValidation(models.AbstractModel): + _inherit = "tier.validation" + + @api.model + def _get_under_validation_exceptions(self): + res = super(TierValidation, self)._get_under_validation_exceptions() or [] + """Extend for more field exceptions.""" + ex_fields = ['categ_id','state', 'customer','supplier','excise_tax'] + for val in ex_fields: + res.append(val) + return res + + @api.multi + def validate_tier(self): + super(TierValidation, self).validate_tier() + # make sure to only work with res.partner object. + if self._name != 'res.partner': + return + for partner in self: + rec = self.env['tier.review'].search([('res_id','=',partner.id),('model','=','res.partner')]) + if rec and rec.status == 'approved': + if not (partner.customer or partner.supplier): + raise ValidationError(_('Cannot Validate. Please configure partner %s as a Customer or Vendor or Both.') % (partner.display_name)) + else: + partner.state = 'approved' + + # Need to override for Partner Tier Validation since can_review field is set to True based only + # if current user is a member of reviewer_ids. This can_review field is used to enable or disable the boolean + # field Is Customer / Is Vendor not only during the Validation process but even if it is in Approved State. + @api.multi + @api.depends('review_ids') + def _compute_reviewer_ids(self): + if str(self.__class__) == "": + for rec in self: + rec.reviewer_ids = rec.review_ids.filtered( + lambda r: r.status in ( 'pending','approved')).mapped('reviewer_ids') + else: + for rec in self: + rec.reviewer_ids = rec.review_ids.filtered( + lambda r: r.status == 'pending').mapped('reviewer_ids') + + @api.multi + def request_validation(self): + res = super().request_validation() + for rec in self.filtered(lambda x: x._name == 'res.partner'): + rec.message_subscribe(partner_ids=[self.env.user.partner_id.id,]) + return res diff --git a/partner_tier_validation/static/description/icon.png b/partner_tier_validation/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/partner_tier_validation/views/res_partner_view.xml b/partner_tier_validation/views/res_partner_view.xml new file mode 100644 index 000000000..81d72cbc3 --- /dev/null +++ b/partner_tier_validation/views/res_partner_view.xml @@ -0,0 +1,96 @@ + + + + + + partner.form.tier + res.partner + + + + +
+ +
+ + +
+ + + + + + + +
+ + + + + {'readonly': [('can_review', '=', False)]} + + + {'readonly': [('can_review', '=', False)]} + + + + + + + partner.form.tier.filter + res.partner + + + + + + + + + + From 9ce6257b269035a07842f6c3740a48e17dc59b60 Mon Sep 17 00:00:00 2001 From: Freni-OSI Date: Wed, 17 Feb 2021 16:00:11 +0530 Subject: [PATCH 2/3] [14.0][MIG]partner_tier_validation --- partner_tier_validation/README.rst | 4 +- partner_tier_validation/__manifest__.py | 12 +- partner_tier_validation/models/__init__.py | 2 +- partner_tier_validation/models/res_partner.py | 23 ++- .../models/tier_validation.py | 55 ++++--- .../views/res_partner_view.xml | 147 ++++++++++-------- 6 files changed, 127 insertions(+), 116 deletions(-) diff --git a/partner_tier_validation/README.rst b/partner_tier_validation/README.rst index b6e7f63e6..c197ce0b7 100644 --- a/partner_tier_validation/README.rst +++ b/partner_tier_validation/README.rst @@ -2,9 +2,9 @@ :target: https://www.gnu.org/licenses/agpl :alt: License: AGPL-3 -==================== +======================= Partner Tier Validation -==================== +======================= This module extends the functionality of Partner to support a tier validation process. diff --git a/partner_tier_validation/__manifest__.py b/partner_tier_validation/__manifest__.py index b3f724a7a..8aa407cac 100644 --- a/partner_tier_validation/__manifest__.py +++ b/partner_tier_validation/__manifest__.py @@ -1,19 +1,17 @@ -# Copyright 2019 Open Source Integrators +# Copyright 2021 Open Source Integrators # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { "name": "Partner Tier Validation", "summary": "Extends the functionality of Contacts to" - "support a tier validation process.", - "version": "12.0.1.0.0", + "support a tier validation process.", + "version": "14.0.1.0.0", + "website": "https://github.com/OCA/partner-contact", "category": "Contact", "author": "Open Source Integrators, Odoo Community Association (OCA)", "license": "AGPL-3", "application": False, "installable": True, - "depends": [ - "contacts", - "base_tier_validation", - ], + "depends": ["contacts", "base_tier_validation", "partner_autocomplete"], "data": [ "views/res_partner_view.xml", ], diff --git a/partner_tier_validation/models/__init__.py b/partner_tier_validation/models/__init__.py index a415f52e7..9253d4876 100644 --- a/partner_tier_validation/models/__init__.py +++ b/partner_tier_validation/models/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2019 Open Source Integrators +# Copyright 2021 Open Source Integrators # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import res_partner diff --git a/partner_tier_validation/models/res_partner.py b/partner_tier_validation/models/res_partner.py index 2085f2c19..aeea2870a 100644 --- a/partner_tier_validation/models/res_partner.py +++ b/partner_tier_validation/models/res_partner.py @@ -1,20 +1,15 @@ -# Copyright 2019 Open Source Integrators +# Copyright 2021 Open Source Integrators # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import models, fields +from odoo import fields, models -class ResPartner(models.Model): +class ResPartner11(models.Model): _name = "res.partner" - _inherit = ['res.partner', 'tier.validation'] - _state_from = ['new', 'to approve'] - _state_to = ['approved'] + _inherit = ["res.partner", "tier.validation", "mail.activity.mixin"] + _state_from = ["new", "to approve"] + _state_to = ["approved"] - # override core odoo to set default value to False - customer = fields.Boolean(string='Is a Customer', default=False, - help="Check this box if this contact is a customer. It can be selected in sales orders.") - - state = fields.Selection(selection=[('new','New'), - ('approved','Approved'),], - string='Status', - default='new' ) + state = fields.Selection( + [("new", "New"), ("approved", "Approved")], string="Status", default="new" + ) diff --git a/partner_tier_validation/models/tier_validation.py b/partner_tier_validation/models/tier_validation.py index 515e3549e..565cc1bb9 100644 --- a/partner_tier_validation/models/tier_validation.py +++ b/partner_tier_validation/models/tier_validation.py @@ -1,53 +1,58 @@ -# Copyright 2019 Open Source Integrators +# Copyright 2021 Open Source Integrators # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import api, models, _ -from odoo.exceptions import ValidationError +from odoo import api, models + class TierValidation(models.AbstractModel): _inherit = "tier.validation" @api.model def _get_under_validation_exceptions(self): - res = super(TierValidation, self)._get_under_validation_exceptions() or [] """Extend for more field exceptions.""" - ex_fields = ['categ_id','state', 'customer','supplier','excise_tax'] + res = super(TierValidation, self)._get_under_validation_exceptions() or [] + ex_fields = ["categ_id", "state", "customer", "supplier", "excise_tax"] for val in ex_fields: res.append(val) return res - @api.multi def validate_tier(self): super(TierValidation, self).validate_tier() # make sure to only work with res.partner object. - if self._name != 'res.partner': - return + if self._name != "res.partner": + return for partner in self: - rec = self.env['tier.review'].search([('res_id','=',partner.id),('model','=','res.partner')]) - if rec and rec.status == 'approved': - if not (partner.customer or partner.supplier): - raise ValidationError(_('Cannot Validate. Please configure partner %s as a Customer or Vendor or Both.') % (partner.display_name)) - else: - partner.state = 'approved' + rec = self.env["tier.review"].search( + [("res_id", "=", partner.id), ("model", "=", "res.partner")] + ) + if rec and rec.status == "approved": + partner.state = "approved" - # Need to override for Partner Tier Validation since can_review field is set to True based only - # if current user is a member of reviewer_ids. This can_review field is used to enable or disable the boolean - # field Is Customer / Is Vendor not only during the Validation process but even if it is in Approved State. - @api.multi - @api.depends('review_ids') + # Need to override for Partner Tier Validation since can_review field + # is set to True based only + # if current user is a member of reviewer_ids. This can_review field + # is used to enable or disable the boolean + # field Is Customer / Is Vendor not only during the Validation process + # but even if it is in Approved State. + @api.depends("review_ids") def _compute_reviewer_ids(self): - if str(self.__class__) == "": + if str(self.__class__) == "": for rec in self: rec.reviewer_ids = rec.review_ids.filtered( - lambda r: r.status in ( 'pending','approved')).mapped('reviewer_ids') + lambda r: r.status in ("pending", "approved") + ).mapped("reviewer_ids") else: for rec in self: rec.reviewer_ids = rec.review_ids.filtered( - lambda r: r.status == 'pending').mapped('reviewer_ids') + lambda r: r.status == "pending" + ).mapped("reviewer_ids") - @api.multi def request_validation(self): res = super().request_validation() - for rec in self.filtered(lambda x: x._name == 'res.partner'): - rec.message_subscribe(partner_ids=[self.env.user.partner_id.id,]) + for rec in self.filtered(lambda x: x._name == "res.partner"): + rec.message_subscribe( + partner_ids=[ + self.env.user.partner_id.id, + ] + ) return res diff --git a/partner_tier_validation/views/res_partner_view.xml b/partner_tier_validation/views/res_partner_view.xml index 81d72cbc3..f6675dc5b 100644 --- a/partner_tier_validation/views/res_partner_view.xml +++ b/partner_tier_validation/views/res_partner_view.xml @@ -1,96 +1,109 @@ - - partner.form.tier res.partner - - - - + + +
- -
-
- - - - -
- - - - {'readonly': [('can_review', '=', False)]} - - - {'readonly': [('can_review', '=', False)]} - - + + + - + partner.form.tier.filter res.partner - + - - - + + - + From 77aeb11520f90ec19ed6c89955c247eb65bfffe0 Mon Sep 17 00:00:00 2001 From: Freni-OSI Date: Wed, 3 Mar 2021 11:46:46 +0530 Subject: [PATCH 3/3] [14.0][IMP]Improved partner_tier_validation --- partner_tier_validation/__manifest__.py | 4 ++-- partner_tier_validation/models/__init__.py | 2 +- partner_tier_validation/models/res_partner.py | 4 ++-- partner_tier_validation/models/tier_validation.py | 2 +- partner_tier_validation/views/res_partner_view.xml | 2 +- .../odoo/addons/partner_tier_validation | 1 + setup/partner_tier_validation/setup.py | 6 ++++++ 7 files changed, 14 insertions(+), 7 deletions(-) create mode 120000 setup/partner_tier_validation/odoo/addons/partner_tier_validation create mode 100644 setup/partner_tier_validation/setup.py diff --git a/partner_tier_validation/__manifest__.py b/partner_tier_validation/__manifest__.py index 8aa407cac..c86cd1f14 100644 --- a/partner_tier_validation/__manifest__.py +++ b/partner_tier_validation/__manifest__.py @@ -1,4 +1,4 @@ -# Copyright 2021 Open Source Integrators +# Copyright 2019 Open Source Integrators # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { "name": "Partner Tier Validation", @@ -11,7 +11,7 @@ "license": "AGPL-3", "application": False, "installable": True, - "depends": ["contacts", "base_tier_validation", "partner_autocomplete"], + "depends": ["contacts", "base_tier_validation"], "data": [ "views/res_partner_view.xml", ], diff --git a/partner_tier_validation/models/__init__.py b/partner_tier_validation/models/__init__.py index 9253d4876..a415f52e7 100644 --- a/partner_tier_validation/models/__init__.py +++ b/partner_tier_validation/models/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2021 Open Source Integrators +# Copyright 2019 Open Source Integrators # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import res_partner diff --git a/partner_tier_validation/models/res_partner.py b/partner_tier_validation/models/res_partner.py index aeea2870a..df52d4b9f 100644 --- a/partner_tier_validation/models/res_partner.py +++ b/partner_tier_validation/models/res_partner.py @@ -1,10 +1,10 @@ -# Copyright 2021 Open Source Integrators +# Copyright 2019 Open Source Integrators # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo import fields, models -class ResPartner11(models.Model): +class ResPartner(models.Model): _name = "res.partner" _inherit = ["res.partner", "tier.validation", "mail.activity.mixin"] _state_from = ["new", "to approve"] diff --git a/partner_tier_validation/models/tier_validation.py b/partner_tier_validation/models/tier_validation.py index 565cc1bb9..a070e2ac1 100644 --- a/partner_tier_validation/models/tier_validation.py +++ b/partner_tier_validation/models/tier_validation.py @@ -1,4 +1,4 @@ -# Copyright 2021 Open Source Integrators +# Copyright 2019 Open Source Integrators # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo import api, models diff --git a/partner_tier_validation/views/res_partner_view.xml b/partner_tier_validation/views/res_partner_view.xml index f6675dc5b..053dbbb44 100644 --- a/partner_tier_validation/views/res_partner_view.xml +++ b/partner_tier_validation/views/res_partner_view.xml @@ -1,5 +1,5 @@ - diff --git a/setup/partner_tier_validation/odoo/addons/partner_tier_validation b/setup/partner_tier_validation/odoo/addons/partner_tier_validation new file mode 120000 index 000000000..f818463a8 --- /dev/null +++ b/setup/partner_tier_validation/odoo/addons/partner_tier_validation @@ -0,0 +1 @@ +../../../../partner_tier_validation \ No newline at end of file diff --git a/setup/partner_tier_validation/setup.py b/setup/partner_tier_validation/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/partner_tier_validation/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)