From 14f975708af220b9ba08fcae41cfc0aeec2a161d Mon Sep 17 00:00:00 2001 From: Ilyas Date: Tue, 22 Aug 2023 16:24:30 +0700 Subject: [PATCH 1/3] [IMP] sale_commission_product_criteria: correct sorting in SQL --- .../models/sale_commission_line_mixin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale_commission_product_criteria/models/sale_commission_line_mixin.py b/sale_commission_product_criteria/models/sale_commission_line_mixin.py index 5f97b5859..cdea718f9 100644 --- a/sale_commission_product_criteria/models/sale_commission_line_mixin.py +++ b/sale_commission_product_criteria/models/sale_commission_line_mixin.py @@ -41,7 +41,7 @@ def _get_commission_items(self, commission, product): AND (item.commission_id = %s) AND (item.active = TRUE) ORDER BY - item.applied_on, categ.complete_name desc + item.applied_on, item.based_on, categ.complete_name desc """, ( product.product_tmpl_id.ids, From 2fe4eecf6a3c0f7f0beb6b62e8c4bf1bd3b662a1 Mon Sep 17 00:00:00 2001 From: Ilyas Date: Tue, 22 Aug 2023 16:25:23 +0700 Subject: [PATCH 2/3] [ADD] sale_commission_product_criteria_domain --- .../README.rst | 0 .../__init__.py | 1 + .../__manifest__.py | 26 ++ .../demo/demo_data.xml | 132 ++++++++ .../models/__init__.py | 6 + .../models/account_invoice_line_agent.py | 28 ++ .../models/commission.py | 81 +++++ .../models/commission_group.py | 70 ++++ .../models/partner.py | 68 ++++ .../models/sale_commission_line_mixin.py | 65 ++++ .../models/sale_order_line_agent.py | 26 ++ .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 7 + .../readme/USAGE.rst | 22 ++ .../security/ir.model.access.csv | 5 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 1 + ...sale_commission_product_criteria_domain.py | 320 ++++++++++++++++++ .../views/views.xml | 219 ++++++++++++ 19 files changed, 1080 insertions(+) create mode 100644 sale_commission_product_criteria_domain/README.rst create mode 100644 sale_commission_product_criteria_domain/__init__.py create mode 100644 sale_commission_product_criteria_domain/__manifest__.py create mode 100644 sale_commission_product_criteria_domain/demo/demo_data.xml create mode 100644 sale_commission_product_criteria_domain/models/__init__.py create mode 100644 sale_commission_product_criteria_domain/models/account_invoice_line_agent.py create mode 100644 sale_commission_product_criteria_domain/models/commission.py create mode 100644 sale_commission_product_criteria_domain/models/commission_group.py create mode 100644 sale_commission_product_criteria_domain/models/partner.py create mode 100644 sale_commission_product_criteria_domain/models/sale_commission_line_mixin.py create mode 100644 sale_commission_product_criteria_domain/models/sale_order_line_agent.py create mode 100644 sale_commission_product_criteria_domain/readme/CONTRIBUTORS.rst create mode 100644 sale_commission_product_criteria_domain/readme/DESCRIPTION.rst create mode 100644 sale_commission_product_criteria_domain/readme/USAGE.rst create mode 100644 sale_commission_product_criteria_domain/security/ir.model.access.csv create mode 100644 sale_commission_product_criteria_domain/static/description/icon.png create mode 100644 sale_commission_product_criteria_domain/tests/__init__.py create mode 100644 sale_commission_product_criteria_domain/tests/test_sale_commission_product_criteria_domain.py create mode 100644 sale_commission_product_criteria_domain/views/views.xml diff --git a/sale_commission_product_criteria_domain/README.rst b/sale_commission_product_criteria_domain/README.rst new file mode 100644 index 000000000..e69de29bb diff --git a/sale_commission_product_criteria_domain/__init__.py b/sale_commission_product_criteria_domain/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/sale_commission_product_criteria_domain/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/sale_commission_product_criteria_domain/__manifest__.py b/sale_commission_product_criteria_domain/__manifest__.py new file mode 100644 index 000000000..f3b0f3a87 --- /dev/null +++ b/sale_commission_product_criteria_domain/__manifest__.py @@ -0,0 +1,26 @@ +# © 2023 ooops404 +# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html +{ + "name": "Sale Commission Product Criteria Domain", + "version": "14.0.1.0.0", + "author": "Ilyas," "Ooops404," "Odoo Community Association (OCA)", + "contributors": ["Ilyas"], + "maintainers": ["ilyasProgrammer"], + "website": "https://github.com/OCA/commission", + "category": "Sales Management", + "license": "AGPL-3", + "depends": [ + "sale_commission_product_criteria", + "web_domain_field", + ], + "demo": [ + "demo/demo_data.xml", + ], + "data": [ + "views/views.xml", + "security/ir.model.access.csv", + ], + "application": False, + "installable": True, + "auto_install": False, +} diff --git a/sale_commission_product_criteria_domain/demo/demo_data.xml b/sale_commission_product_criteria_domain/demo/demo_data.xml new file mode 100644 index 000000000..faa6da478 --- /dev/null +++ b/sale_commission_product_criteria_domain/demo/demo_data.xml @@ -0,0 +1,132 @@ + + + + + Based on Rules Restricted + product_restricted + + + + + Spain + + + + + Italy + + + + + + + + sol + 3_global + fixed + 10 + + + + + + + sol + 2_product_category + fixed + 20 + + + + + + + + sol + 1_product + percentage + 5 + + + + + + + + sol + 0_product_variant + percentage + 15 + + + + + + + Agent Rules Restricted Italy + True + True + + + + + Agent Rules Restricted Spain + True + True + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sale_commission_product_criteria_domain/models/__init__.py b/sale_commission_product_criteria_domain/models/__init__.py new file mode 100644 index 000000000..8aa51beed --- /dev/null +++ b/sale_commission_product_criteria_domain/models/__init__.py @@ -0,0 +1,6 @@ +from . import commission +from . import commission_group +from . import partner +from . import account_invoice_line_agent +from . import sale_order_line_agent +from . import sale_commission_line_mixin diff --git a/sale_commission_product_criteria_domain/models/account_invoice_line_agent.py b/sale_commission_product_criteria_domain/models/account_invoice_line_agent.py new file mode 100644 index 000000000..3d24b65c8 --- /dev/null +++ b/sale_commission_product_criteria_domain/models/account_invoice_line_agent.py @@ -0,0 +1,28 @@ +# © 2023 ooops404 +# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html +from odoo import api, models + + +class AccountInvoiceLineAgent(models.Model): + _inherit = "account.invoice.line.agent" + + @api.depends( + "object_id.price_subtotal", + "object_id.product_id.commission_free", + "commission_id", + ) + def _compute_amount(self): + for line in self: + if ( + line.commission_id + and line.commission_id.commission_type == "product_restricted" + ): + inv_line = line.object_id + line.amount = line._get_single_commission_amount( + line.commission_id, + inv_line.price_subtotal, + inv_line.product_id, + inv_line.quantity, + ) + else: + super(AccountInvoiceLineAgent, line)._compute_amount() diff --git a/sale_commission_product_criteria_domain/models/commission.py b/sale_commission_product_criteria_domain/models/commission.py new file mode 100644 index 000000000..c280d9535 --- /dev/null +++ b/sale_commission_product_criteria_domain/models/commission.py @@ -0,0 +1,81 @@ +# © 2023 ooops404 +# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html +from odoo import api, fields, models + + +class SaleCommission(models.Model): + _inherit = "sale.commission" + + commission_type = fields.Selection( + selection_add=[("product_restricted", "Product criteria (with restrictions)")], + ondelete={"product_restricted": "set default"}, + ) + + +class CommissionItem(models.Model): + _inherit = "commission.item" + + commission_id = fields.Many2one( + "sale.commission", + string="Commission Type", + domain=[("commission_type", "in", ["product", "product_restricted"])], + required=True, + ) + sale_commission_type = fields.Selection( + related="commission_id.commission_type", readonly=True + ) + group_id = fields.Many2one( + "commission.items.group", + ondelete="restrict", + ) + + def write(self, values): + res = super().write(values) + if self.group_id and not self.group_id.commission_ids.ids: + self.group_id.commission_ids = [(6, 0, self.commission_id.ids)] + if self.commission_id.commission_type != "product_restricted" and self.group_id: + self.group_id = False + return res + + +class CommissionItemAgent(models.Model): + _name = "commission.item.agent" + _description = "Commission Item Agent" + + _sql_constraints = [ + ( + "commission_item_unique_agent", + "UNIQUE(partner_id, agent_id)", + "You can only add one time each agent into Commission " + "Items Groups Restrictions table.", + ) + ] + + partner_agent_ids = fields.Many2many(related="partner_id.agent_ids") + agent_group_ids = fields.Many2many( + "commission.items.group", compute="_compute_agent_group_ids" + ) + agent_id = fields.Many2one( + "res.partner", domain='[("id", "in", partner_agent_ids)]', required=True + ) + partner_id = fields.Many2one( + "res.partner", domain=[("agent", "=", False)], required=True + ) + group_ids = fields.Many2many( + "commission.items.group", + domain="[('id', 'in', agent_group_ids)]", + string="Commission Items Groups Restrictions", + required=True, + ) + + @api.depends("agent_id") + def _compute_agent_group_ids(self): + for rec in self: + if rec.agent_id.allowed_commission_group_ids: + dom = ("group_id", "in", rec.agent_id.allowed_commission_group_ids.ids) + else: + dom = ("group_id", "!=", False) + items = self.env["commission.item"].search( + [("commission_id", "=", rec.agent_id.commission_id.id), dom] + ) + rec.agent_group_ids = [(6, 0, items.mapped("group_id").ids)] diff --git a/sale_commission_product_criteria_domain/models/commission_group.py b/sale_commission_product_criteria_domain/models/commission_group.py new file mode 100644 index 000000000..e0746fa0b --- /dev/null +++ b/sale_commission_product_criteria_domain/models/commission_group.py @@ -0,0 +1,70 @@ +# © 2023 ooops404 +# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html +from odoo import _, api, exceptions, fields, models + + +class CommissionItemsGroup(models.Model): + _name = "commission.items.group" + _description = "Commission Items Group" + _sql_constraints = [ + ( + "unique_cig_name", + "UNIQUE(name)", + "Commission items group with such name already exists. " + "Name must be unique.", + ) + ] + + name = fields.Char(required=True) + commission_ids = fields.Many2many( + "sale.commission", + compute="_compute_commission_ids", + domain=[("commission_type", "=", "product_restricted")], + readonly=True, + store=True, + ) + item_ids = fields.One2many( + "commission.item", "group_id", string="Items", readonly=True + ) + agents_count = fields.Integer(compute="_compute_agents_count") + + @api.depends("item_ids") + def _compute_commission_ids(self): + for rec in self: + rec.commission_ids = [(6, 0, rec.item_ids.mapped("commission_id").ids)] + + def unlink(self): + if self.item_ids: + raise exceptions.ValidationError( + _( + "You can not delete this commission group since " + "there is related to it commission items." + ) + ) + return super().unlink() + + def _compute_agents_count(self): + res_partner_obj = self.env["res.partner"] + for rec in self: + self.agents_count = res_partner_obj.search_count( + [ + ("agent", "=", True), + ("allowed_commission_group_ids", "in", rec.ids), + ] + ) + + def action_open_related_agents(self): + agent_ids = self.env["res.partner"].search( + [ + ("agent", "=", True), + ("allowed_commission_group_ids", "in", self.ids), + ] + ) + return { + "name": _("Commission Group Agents"), + "type": "ir.actions.act_window", + "view_mode": "tree", + "res_model": "res.partner", + "context": self.env.context, + "domain": [("id", "in", agent_ids.ids)], + } diff --git a/sale_commission_product_criteria_domain/models/partner.py b/sale_commission_product_criteria_domain/models/partner.py new file mode 100644 index 000000000..0d6e0c9fe --- /dev/null +++ b/sale_commission_product_criteria_domain/models/partner.py @@ -0,0 +1,68 @@ +# © 2023 ooops404 +# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html +import json + +from odoo import api, fields, models + + +class ResPartner(models.Model): + _inherit = "res.partner" + + apply_commission_restrictions = fields.Boolean("Apply Restrictions") + commission_item_agent_ids = fields.One2many( + "commission.item.agent", "partner_id", string="Commission Items Groups" + ) + allowed_commission_group_ids = fields.Many2many( + "commission.items.group", help="Related only to agents" + ) + allowed_commission_group_ids_domain = fields.Char( + compute="_compute_allowed_commission_group_ids_domain", + readonly=True, + store=False, + ) + commission_type = fields.Selection(related="commission_id.commission_type") + + @api.depends("commission_id") + def _compute_allowed_commission_group_ids_domain(self): + for rec in self: + if rec.agent: + allowed_group_ids = rec.commission_id.filtered( + lambda x: x.commission_type == "product_restricted" + ).item_ids.mapped("group_id") + rec.allowed_commission_group_ids_domain = json.dumps( + [("id", "in", allowed_group_ids.ids)] + ) + else: + rec.allowed_commission_group_ids_domain = False + + @api.onchange("agent_ids") + def _onchange_agent_ids(self): + for rec in self: + exiting_agents = rec.commission_item_agent_ids.mapped("agent_id") + to_create = [ + {"partner_id": rec._origin.id, "agent_id": x._origin.id} + for x in rec.agent_ids.filtered( + lambda x: x.commission_id.commission_type == "product_restricted" + ) + if x not in exiting_agents.ids + ] + to_delete = rec.commission_item_agent_ids.filtered( + lambda x: x.agent_id.id in (exiting_agents - rec.agent_ids).ids + ) + if to_delete: + rec.update( + {"commission_item_agent_ids": [(2, dl.id, 0) for dl in to_delete]} + ) + if to_create: + rec.update( + {"commission_item_agent_ids": [(0, 0, line) for line in to_create]} + ) + + def write(self, vals): + res = super().write(vals) + if ( + self.commission_id.commission_type != "product_restricted" + and self.allowed_commission_group_ids + ): + self.allowed_commission_group_ids = False + return res diff --git a/sale_commission_product_criteria_domain/models/sale_commission_line_mixin.py b/sale_commission_product_criteria_domain/models/sale_commission_line_mixin.py new file mode 100644 index 000000000..d44075e8f --- /dev/null +++ b/sale_commission_product_criteria_domain/models/sale_commission_line_mixin.py @@ -0,0 +1,65 @@ +# © 2023 ooops404 +# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html +from odoo import models + + +class SaleCommissionLineMixin(models.AbstractModel): + _inherit = "sale.commission.line.mixin" + + def _get_commission_items(self, commission, product): + # Method replaced + categ_ids = {} + categ = product.categ_id + while categ: + categ_ids[categ.id] = True + categ = categ.parent_id + categ_ids = list(categ_ids) + + # Module specific mod: + if self.object_id._name == "sale.order.line": + partner = self.object_id.order_id.partner_id + elif self.object_id._name == "account.move.line": + partner = self.object_id.partner_id + else: + partner = False + if partner: + group_ids = ( + partner.commission_item_agent_ids.filtered( + lambda x: x.agent_id == self.agent_id + ) + .mapped("group_ids") + .ids + ) + else: + group_ids = [] + + # Select all suitable items. Order by best match + # (priority is: all/cat/subcat/product/variant). + self.env.cr.execute( + """ + SELECT + item.id + FROM + commission_item AS item + LEFT JOIN product_category AS categ ON item.categ_id = categ.id + LEFT JOIN commission_item_agent AS cia ON item.group_id = cia.id + WHERE + (item.product_tmpl_id IS NULL OR item.product_tmpl_id = any(%s)) + AND (item.product_id IS NULL OR item.product_id = any(%s)) + AND (item.categ_id IS NULL OR item.categ_id = any(%s)) + AND (item.commission_id = %s) + AND (item.active = TRUE) + AND (cia.id IS NULL OR cia.id = any(%s)) + ORDER BY + item.applied_on, item.based_on, categ.complete_name desc + """, + ( + product.product_tmpl_id.ids, + product.ids, + categ_ids, + commission._origin.id, + group_ids, + ), + ) + item_ids = [x[0] for x in self.env.cr.fetchall()] + return item_ids diff --git a/sale_commission_product_criteria_domain/models/sale_order_line_agent.py b/sale_commission_product_criteria_domain/models/sale_order_line_agent.py new file mode 100644 index 000000000..923fac456 --- /dev/null +++ b/sale_commission_product_criteria_domain/models/sale_order_line_agent.py @@ -0,0 +1,26 @@ +# © 2023 ooops404 +# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html +from odoo import api, models + + +class SaleOrderLineAgent(models.Model): + _inherit = "sale.order.line.agent" + + @api.depends( + "object_id.price_subtotal", "object_id.product_id", "object_id.product_uom_qty" + ) + def _compute_amount(self): + for line in self: + if ( + line.commission_id + and line.commission_id.commission_type == "product_restricted" + ): + order_line = line.object_id + line.amount = line._get_single_commission_amount( + line.commission_id, + order_line.price_subtotal, + order_line.product_id, + order_line.product_uom_qty, + ) + else: + super(SaleOrderLineAgent, line)._compute_amount() diff --git a/sale_commission_product_criteria_domain/readme/CONTRIBUTORS.rst b/sale_commission_product_criteria_domain/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..c29a9c72e --- /dev/null +++ b/sale_commission_product_criteria_domain/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Ooops404 `__: + + * Ilyas diff --git a/sale_commission_product_criteria_domain/readme/DESCRIPTION.rst b/sale_commission_product_criteria_domain/readme/DESCRIPTION.rst new file mode 100644 index 000000000..30ea93fd3 --- /dev/null +++ b/sale_commission_product_criteria_domain/readme/DESCRIPTION.rst @@ -0,0 +1,7 @@ +This module allows to manage the following commission structure use case: + +Agent A receives commission 50 when selling product 1 to customer X + +Agent A receives commission 20 when selling product 1 to customer Y + +This behavior is integrated with both pricelist-like Commission Type structure (sale_commission_product_criteria) and commission by discount (sale_commission_product_criteria_discount) diff --git a/sale_commission_product_criteria_domain/readme/USAGE.rst b/sale_commission_product_criteria_domain/readme/USAGE.rst new file mode 100644 index 000000000..72e9f3a9d --- /dev/null +++ b/sale_commission_product_criteria_domain/readme/USAGE.rst @@ -0,0 +1,22 @@ +Go to Sales > Commission management > Commission Type Items Groups + +Create one or more new Groups, eg. “Italy” and “Spain” + +Create new Commission type, select type “Product Criteria (with restrictions)”, eg: “Southern Europe” + +Add lines to Commission type; for each line one Group must be set, eg. + + Product: Conference Chair, value: $20, group: Italy + + Product: Conference Chair, value: $10, group: Spain + + +Go to Agent A, assign Commission type: “Southern Europe” > add “Allowed Commission Groups”: “Italy”, “Spain” + +In this way, we are allowing Commission type lines for both “Spain” and “Italy” to be applied to this agent. + +Go to customer X, set agent: “Agent A” > in table “Commission items group” set group “Spain” + +Go to customer Y, set agent: “Agent A” > in table “Commission items group” set group “Italy” + +On sales for customer X, only Commission type lines with group “Spain” will be applied to agent; on sales for customer Y, only Commission type lines with group “Italy” will be applied to agent. diff --git a/sale_commission_product_criteria_domain/security/ir.model.access.csv b/sale_commission_product_criteria_domain/security/ir.model.access.csv new file mode 100644 index 000000000..ada09650e --- /dev/null +++ b/sale_commission_product_criteria_domain/security/ir.model.access.csv @@ -0,0 +1,5 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +cia1,cia1,model_commission_item_agent,sales_team.group_sale_manager,1,1,1,1 +cia2,cia2,model_commission_item_agent,sales_team.group_sale_salesman,1,1,0,0 +cig1,cig1,model_commission_items_group,sales_team.group_sale_manager,1,1,1,1 +cig2,cig2,model_commission_items_group,sales_team.group_sale_salesman,1,1,0,0 diff --git a/sale_commission_product_criteria_domain/static/description/icon.png b/sale_commission_product_criteria_domain/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/sale_commission_product_criteria_domain/tests/__init__.py b/sale_commission_product_criteria_domain/tests/__init__.py new file mode 100644 index 000000000..110b0564c --- /dev/null +++ b/sale_commission_product_criteria_domain/tests/__init__.py @@ -0,0 +1 @@ +from . import test_sale_commission_product_criteria_domain diff --git a/sale_commission_product_criteria_domain/tests/test_sale_commission_product_criteria_domain.py b/sale_commission_product_criteria_domain/tests/test_sale_commission_product_criteria_domain.py new file mode 100644 index 000000000..96ef954cf --- /dev/null +++ b/sale_commission_product_criteria_domain/tests/test_sale_commission_product_criteria_domain.py @@ -0,0 +1,320 @@ +# Copyright 2023 - ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +import odoo.exceptions +from odoo.tests.common import SavepointCase + + +class TestSaleCommissionDomain(SavepointCase): + @classmethod + def setUpClass(cls): + super(TestSaleCommissionDomain, cls).setUpClass() + cls.commission_model = cls.env["sale.commission"] + cls.company = cls.env.ref("base.main_company") + cls.res_partner_model = cls.env["res.partner"] + cls.azure = cls.env.ref("base.res_partner_12") # Azure + cls.deco = cls.env.ref("base.res_partner_2") # Deco + cls.partner2 = cls.env.ref("base.res_partner_10") # The Jackson Group + cls.sale_order_model = cls.env["sale.order"] + cls.advance_inv_model = cls.env["sale.advance.payment.inv"] + cls.settle_model = cls.env["sale.commission.settlement"] + cls.make_settle_model = cls.env["sale.commission.make.settle"] + cls.make_inv_model = cls.env["sale.commission.make.invoice"] + cls.product_1 = cls.env.ref("product.product_product_1") + cls.product_4 = cls.env.ref("product.product_product_4") + cls.product_5 = cls.env.ref("product.product_product_5") + cls.product_6 = cls.env.ref("product.product_product_6") + # Acoustic Bloc Screens + cls.product_product_25 = cls.env.ref("product.product_product_25") + cls.product_1.write({"invoice_policy": "order"}) + cls.product_4.write({"invoice_policy": "order"}) + cls.product_5.write({"invoice_policy": "order"}) + cls.product_product_25.write({"invoice_policy": "order"}) + cls.product_6.write({"commission_free": True, "invoice_policy": "order"}) + cls.product_template_4 = cls.env.ref( + "product.product_product_4_product_template" + ) # Customizable Desk (CONFIG) + cls.product_template_4.write({"invoice_policy": "order"}) + cls.pt_11 = cls.env.ref("product.product_product_11_product_template") + cls.journal = cls.env["account.journal"].search( + [("type", "=", "purchase")], limit=1 + ) + cls.rules_commission_id = cls.env.ref( + "sale_commission_product_criteria.demo_commission_rules" + ) + cls.com_item_1 = cls.env.ref( + "sale_commission_product_criteria.demo_commission_rules_item_1" + ) + cls.com_item_2 = cls.env.ref( + "sale_commission_product_criteria.demo_commission_rules_item_2" + ) + cls.com_item_3 = cls.env.ref( + "sale_commission_product_criteria.demo_commission_rules_item_3" + ) + cls.com_item_4 = cls.env.ref( + "sale_commission_product_criteria.demo_commission_rules_item_4" + ) + cls.demo_crr_item_1 = cls.env.ref( + "sale_commission_product_criteria_domain.demo_crr_item_1" + ) + cls.demo_cig_spain = cls.env.ref( + "sale_commission_product_criteria_domain.demo_cig_spain" + ) + cls.demo_cig_italy = cls.env.ref( + "sale_commission_product_criteria_domain.demo_cig_italy" + ) + cls.demo_agent_rules_restricted_italy = cls.env.ref( + "sale_commission_product_criteria_domain.demo_agent_rules_restricted_italy" + ) + cls.demo_agent_rules_restricted_spain = cls.env.ref( + "sale_commission_product_criteria_domain.demo_agent_rules_restricted_spain" + ) + cls.demo_commission_rules_restrict = cls.env.ref( + "sale_commission_product_criteria_domain.demo_commission_rules_restrict" + ) + cls.demo_commission_rules = cls.env.ref( + "sale_commission_product_criteria.demo_commission_rules" + ) + cls.demo_commission = cls.env.ref("sale_commission.demo_commission") + cls.conf_chair_config_id = cls.env.ref( + "product.product_product_11_product_template" + ) + cls.cia_azure = cls.env.ref("sale_commission_product_criteria_domain.cia_azure") + cls.res_partner_tiny_sale_agent = cls.env.ref( + "sale_commission.res_partner_tiny_sale_agent" + ) + + def test_commission_domain_demo_cases(self): + # Azure Spain Office furn. - Category + so = self._create_sale_order(self.product_5, self.azure) + so.recompute_lines_agents() + so.action_confirm() + invoice = self._invoice_sale_order(so) + invoice.recompute_lines_agents() + so.order_line.agent_ids._compute_amount() + invoice.line_ids.agent_ids._compute_amount() + self.assertEqual(so.order_line.agent_ids.fixed_amount, 20) + self.assertEqual(invoice.line_ids.agent_ids.amount, 20) + + # Azure Spain Customizable Desk (CONFIG) - Product Template + so = self._create_sale_order( + self.product_template_4.product_variant_id, self.azure + ) + so.recompute_lines_agents() + so.action_confirm() + invoice = self._invoice_sale_order(so) + invoice.recompute_lines_agents() + so.order_line.agent_ids._compute_amount() + invoice.line_ids.agent_ids._compute_amount() + self.assertEqual(so.order_line.agent_ids.percent_amount, 5) + self.assertEqual(invoice.line_ids.agent_ids.amount, 50) + + # Azure Spain Variant: Customizable Desk (CONFIG) (Steel, White) - Variant + so = self._create_sale_order(self.product_4, self.azure) + so.recompute_lines_agents() + so.action_confirm() + invoice = self._invoice_sale_order(so) + invoice.recompute_lines_agents() + so.order_line.agent_ids._compute_amount() + invoice.line_ids.agent_ids._compute_amount() + self.assertEqual(so.order_line.agent_ids.percent_amount, 15) + self.assertEqual(invoice.line_ids.agent_ids.amount, 150) + + # Deco Italy - All products + so = self._create_sale_order(self.product_product_25, self.deco) + so.recompute_lines_agents() + so.action_confirm() + invoice = self._invoice_sale_order(so) + invoice.recompute_lines_agents() + so.order_line.agent_ids._compute_amount() + invoice.line_ids.agent_ids._compute_amount() + self.assertEqual(so.order_line.agent_ids.fixed_amount, 10) + self.assertEqual(invoice.line_ids.agent_ids.amount, 10) + + def test_commission_domain(self): + # group must have commission of CI + self.demo_crr_item_1.group_id.commission_ids = False + self.demo_crr_item_1.write({"sequence": 2}) + self.assertTrue(self.demo_crr_item_1.group_id.commission_ids) + + # count related agents + self.demo_cig_italy._compute_agents_count() + # self.assertEqual(demo_cig_italy.agents_count, 1) + + # if commission is not type of restricted then CI must have no group + self.demo_crr_item_1.commission_id = self.demo_commission_rules + self.demo_crr_item_1.write({"sequence": 3}) + self.assertFalse(self.demo_crr_item_1.group_id) + + # commission.item.agent: check agent_group_ids computed properly + self.cia_azure._compute_agent_group_ids() + self.assertTrue(self.cia_azure.agent_group_ids) + + # commission.item.agent: check agent_group_ids is False when agent got no rules + self.cia_azure.agent_id = self.res_partner_tiny_sale_agent + self.cia_azure._compute_agent_group_ids() + self.assertFalse(self.cia_azure.agent_group_ids) + + # false, when commission is not product_restricted + self.res_partner_tiny_sale_agent.write( + { + "allowed_commission_group_ids": [(6, 0, self.demo_cig_spain.ids)], + } + ) + self.assertFalse(self.res_partner_tiny_sale_agent.allowed_commission_group_ids) + + # check some partners compute methods + self.azure._onchange_agent_ids() + self.azure._compute_allowed_commission_group_ids_domain() + self.assertFalse(self.azure.allowed_commission_group_ids_domain) + self.demo_agent_rules_restricted_italy._compute_allowed_commission_group_ids_domain() + self.assertTrue( + self.demo_agent_rules_restricted_italy.allowed_commission_group_ids_domain + ) + + # trigger window action + action = self.demo_cig_spain.action_open_related_agents() + self.assertEqual(type(action), dict) + + # you cant delete it having related CIs + with self.assertRaises(exception=odoo.exceptions.ValidationError): + self.demo_cig_spain.unlink() + + # + self.env["commission.items.group"].create({"name": "Delete Me"}).unlink() + + # computes was modified to consider new commission type: product_restricted + so = self._create_sale_order(self.product_4, self.azure) + so.recompute_lines_agents() + so.action_confirm() + invoice = self._invoice_sale_order(so) + invoice.recompute_lines_agents() + so.order_line.agent_ids._compute_amount() + invoice.line_ids.agent_ids._compute_amount() + self.assertEqual(so.order_line.agent_ids.amount, 150) + self.assertEqual(invoice.line_ids.agent_ids.amount, 150) + + # + tst_partner = so.partner_id.copy({}) + tst_partner.commission_item_agent_ids = [(6, 0, self.demo_cig_italy.ids)] + so.partner_id = tst_partner + so.order_line.agent_ids.agent_id = self.demo_agent_rules_restricted_italy + res = so.order_line.agent_ids._get_single_commission_amount( + self.demo_commission_rules_restrict, + 1, + self.conf_chair_config_id.product_variant_id, + 1, + ) + self.assertEqual(res, 20) + + # computes was modified to consider new commission type: product_restricted + self.demo_agent_rules_restricted_italy.commission_id = ( + self.demo_commission_rules_restrict + ) + so = self._create_sale_order(self.product_5, self.azure) + so.recompute_lines_agents() + so.action_confirm() + invoice = self._invoice_sale_order(so) + invoice.recompute_lines_agents() + so.order_line.agent_ids._compute_amount() + invoice.line_ids.agent_ids._compute_amount() + self.assertEqual(so.order_line.agent_ids.amount, 20) + self.assertEqual(invoice.line_ids.agent_ids.amount, 20) + + # computes was modified to consider new commission type: product_restricted + self.product_5.commission_free = True + so = self._create_sale_order(self.product_5, self.azure) + so.recompute_lines_agents() + so.action_confirm() + invoice = self._invoice_sale_order(so) + invoice.recompute_lines_agents() + so.order_line.agent_ids._compute_amount() + invoice.line_ids.agent_ids._compute_amount() + self.assertEqual(so.order_line.agent_ids.amount, 0) + self.assertEqual(invoice.line_ids.agent_ids.amount, 0) + + # computes was modified to consider new commission type: product_restricted + self.azure.agent_ids.commission_id = self.demo_commission_rules + so = self._create_sale_order(self.product_6, self.azure) + so.recompute_lines_agents() + so.action_confirm() + invoice = self._invoice_sale_order(so) + invoice.recompute_lines_agents() + so.order_line.agent_ids._compute_amount() + invoice.line_ids.agent_ids._compute_amount() + self.assertEqual(so.order_line.agent_ids.amount, 0) + self.assertEqual(invoice.line_ids.agent_ids.amount, 0) + + # computes was modified to consider new commission type: product_restricted + so = self._create_sale_order(self.product_1, self.azure) + so.recompute_lines_agents() + so.action_confirm() + invoice = self._invoice_sale_order(so) + invoice.recompute_lines_agents() + so.order_line.agent_ids._compute_amount() + invoice.line_ids.agent_ids._compute_amount() + self.assertEqual(so.order_line.agent_ids.amount, 15) + self.assertEqual(invoice.line_ids.agent_ids.amount, 15) + + # discount net_amount percentage + self.demo_agent_rules_restricted_spain.commission_id = ( + self.demo_commission_rules_restrict + ) + self.azure.commission_item_agent_ids.group_ids = [ + (6, 0, self.demo_cig_spain.ids) + ] + so = self._create_sale_order(self.pt_11.product_variant_id, self.azure) + so.order_line.discount = 20 + so.recompute_lines_agents() + so.action_confirm() + so.order_line.agent_ids.commission_id.item_ids.commission_type = "percentage" + so.order_line.agent_ids._compute_amount() + invoice.line_ids.agent_ids.commission_id = self.demo_commission_rules_restrict + invoice.line_ids.agent_ids.commission_id.amount_base_type = "net_amount" + invoice.line_ids.agent_ids.commission_id.item_ids.commission_type = "percentage" + invoice.line_ids.agent_ids._compute_amount() + self.assertEqual(so.order_line.agent_ids.amount, 0) + self.assertEqual(invoice.line_ids.agent_ids.amount, 0) + + # no commission items + self.demo_commission_rules_restrict.item_ids.unlink() + so = self._create_sale_order(self.pt_11.product_variant_id, self.azure) + so.recompute_lines_agents() + so.action_confirm() + so.order_line.agent_ids._compute_amount() + invoice.line_ids.agent_ids._compute_amount() + self.assertEqual(so.order_line.agent_ids.amount, 0) + self.assertEqual(invoice.line_ids.agent_ids.amount, 0) + + def _create_sale_order(self, product, partner): + return self.sale_order_model.create( + { + "partner_id": partner.id, + "order_line": [ + ( + 0, + 0, + { + "name": product.name, + "product_id": product.id, + "product_uom_qty": 1.0, + "product_uom": product.uom_id.id, + "price_unit": 1000, + }, + ) + ], + } + ) + + def _invoice_sale_order(self, sale_order, date=None): + old_invoices = sale_order.invoice_ids + wizard = self.advance_inv_model.create({"advance_payment_method": "delivered"}) + wizard.with_context( + { + "active_model": "sale.order", + "active_ids": [sale_order.id], + "active_id": sale_order.id, + } + ).create_invoices() + invoice = sale_order.invoice_ids - old_invoices + invoice.flush() + return invoice diff --git a/sale_commission_product_criteria_domain/views/views.xml b/sale_commission_product_criteria_domain/views/views.xml new file mode 100644 index 000000000..06355af79 --- /dev/null +++ b/sale_commission_product_criteria_domain/views/views.xml @@ -0,0 +1,219 @@ + + + + + res.partner.form.agent.inherit + res.partner + + + + + + + + + + + + + + + + + + + + + + + + commission.item.agent.form + commission.item.agent + + +
+ + + + + + + + + + + +
+ + + + + commission.item.agent.tree + commission.item.agent + + + + + + + + + + + + + + commission.item.tree.inherit + commission.item + + + + + + + + + + + commission.item.form.inherit + commission.item + + + + + + + + + + + commission.items.group.form + commission.items.group + +
+ +
+ +
+ + + + + + + + +
+ + + + + commission.items.group.tree + commission.items.group + + + + + + + + + + Commission Type Items Groups + ir.actions.act_window + commission.items.group + tree,form + + + + + sale.commission.form.view.mod.inherit + sale.commission + + + + + {'invisible': [('commission_type', 'not in', ['product','product_restricted'])]} + + + + + + + + + + sale.commission.form.view.inherit + sale.commission + + + + + {'invisible': [('commission_type', 'in', ['product','product_restricted'])]} + + + + + + + + From e4a6d48f749520f9bc9f8c8b7dfdc7bcdcc8768c Mon Sep 17 00:00:00 2001 From: Ilyas Date: Tue, 22 Aug 2023 16:26:30 +0700 Subject: [PATCH 3/3] [IMP] sale_commission_product_criteria_discount: correct commission type check --- sale_commission_product_criteria_discount/models/sale.py | 2 +- .../readme/DESCRIPTION.rst | 8 +------- .../odoo/addons/sale_commission_product_criteria_domain | 1 + setup/sale_commission_product_criteria_domain/setup.py | 6 ++++++ 4 files changed, 9 insertions(+), 8 deletions(-) create mode 120000 setup/sale_commission_product_criteria_domain/odoo/addons/sale_commission_product_criteria_domain create mode 100644 setup/sale_commission_product_criteria_domain/setup.py diff --git a/sale_commission_product_criteria_discount/models/sale.py b/sale_commission_product_criteria_discount/models/sale.py index 45c9ae882..046a6d149 100644 --- a/sale_commission_product_criteria_discount/models/sale.py +++ b/sale_commission_product_criteria_discount/models/sale.py @@ -14,7 +14,7 @@ def _get_single_commission_amount(self, commission, subtotal, product, quantity) self.ensure_one() if product.commission_free or not commission: return 0.0 - if commission.commission_type != "product": + if commission.commission_type in ["percentage", "fixed"]: return self._get_commission_amount(commission, subtotal, product, quantity) item_ids = self._get_commission_items(commission, product) if not item_ids: diff --git a/sale_commission_product_criteria_domain/readme/DESCRIPTION.rst b/sale_commission_product_criteria_domain/readme/DESCRIPTION.rst index 30ea93fd3..4916f9805 100644 --- a/sale_commission_product_criteria_domain/readme/DESCRIPTION.rst +++ b/sale_commission_product_criteria_domain/readme/DESCRIPTION.rst @@ -1,7 +1 @@ -This module allows to manage the following commission structure use case: - -Agent A receives commission 50 when selling product 1 to customer X - -Agent A receives commission 20 when selling product 1 to customer Y - -This behavior is integrated with both pricelist-like Commission Type structure (sale_commission_product_criteria) and commission by discount (sale_commission_product_criteria_discount) +This module allows to limit applied commission items for specific groups. diff --git a/setup/sale_commission_product_criteria_domain/odoo/addons/sale_commission_product_criteria_domain b/setup/sale_commission_product_criteria_domain/odoo/addons/sale_commission_product_criteria_domain new file mode 120000 index 000000000..1e9f2ff8a --- /dev/null +++ b/setup/sale_commission_product_criteria_domain/odoo/addons/sale_commission_product_criteria_domain @@ -0,0 +1 @@ +../../../../sale_commission_product_criteria_domain \ No newline at end of file diff --git a/setup/sale_commission_product_criteria_domain/setup.py b/setup/sale_commission_product_criteria_domain/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/sale_commission_product_criteria_domain/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)