From a4440245a5a903cc37cd25984b2d239a49b4bec7 Mon Sep 17 00:00:00 2001 From: Alessio Renda Date: Fri, 8 Sep 2023 16:54:31 +0200 Subject: [PATCH 1/2] [IMP] sale_commission_geo_assign: Divide wizard function Make it easier to override --- .../wizard/wizard_geo_assign_partner.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sale_commission_geo_assign/wizard/wizard_geo_assign_partner.py b/sale_commission_geo_assign/wizard/wizard_geo_assign_partner.py index a12ae8893..fecff2b5d 100644 --- a/sale_commission_geo_assign/wizard/wizard_geo_assign_partner.py +++ b/sale_commission_geo_assign/wizard/wizard_geo_assign_partner.py @@ -1,6 +1,5 @@ # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). - -from odoo import _, fields, models +from odoo import _, api, fields, models from odoo.exceptions import UserError @@ -32,4 +31,8 @@ def geo_assign_partner(self): ) for agent in agents: if agent.is_assignable(partner): - partner.agent_ids = [(4, agent.id)] + self.update_data(partner, agent) + + @api.model + def update_data(self, partner, agent): + partner.agent_ids = [(4, agent.id)] From 460f444076b2b1da9505d162a6e3afce5f402df4 Mon Sep 17 00:00:00 2001 From: Alessio Renda Date: Fri, 8 Sep 2023 16:56:29 +0200 Subject: [PATCH 2/2] [ADD] sale_commission_geo_assign_product_domain --- .../wizard/wizard_geo_assign_partner.py | 8 +- .../README.rst | 92 ++++ .../__init__.py | 5 + .../__manifest__.py | 26 ++ .../models/__init__.py | 5 + .../models/res_partner.py | 26 ++ .../models/res_partner_commission_group.py | 46 ++ .../readme/CONFIGURE.rst | 1 + .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 5 + .../readme/USAGE.rst | 1 + .../security/ir.model.access.csv | 2 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 437 ++++++++++++++++++ .../tests/__init__.py | 4 + ...le_commission_geo_assign_product_domain.py | 122 +++++ .../views/res_partner_view.xml | 52 +++ .../wizards/__init__.py | 4 + .../wizards/wizard_geo_assign_partner.py | 33 ++ .../sale_commission_geo_assign_product_domain | 1 + .../setup.py | 6 + 21 files changed, 874 insertions(+), 4 deletions(-) create mode 100644 sale_commission_geo_assign_product_domain/README.rst create mode 100644 sale_commission_geo_assign_product_domain/__init__.py create mode 100644 sale_commission_geo_assign_product_domain/__manifest__.py create mode 100644 sale_commission_geo_assign_product_domain/models/__init__.py create mode 100644 sale_commission_geo_assign_product_domain/models/res_partner.py create mode 100644 sale_commission_geo_assign_product_domain/models/res_partner_commission_group.py create mode 100644 sale_commission_geo_assign_product_domain/readme/CONFIGURE.rst create mode 100644 sale_commission_geo_assign_product_domain/readme/CONTRIBUTORS.rst create mode 100644 sale_commission_geo_assign_product_domain/readme/DESCRIPTION.rst create mode 100644 sale_commission_geo_assign_product_domain/readme/USAGE.rst create mode 100644 sale_commission_geo_assign_product_domain/security/ir.model.access.csv create mode 100644 sale_commission_geo_assign_product_domain/static/description/icon.png create mode 100644 sale_commission_geo_assign_product_domain/static/description/index.html create mode 100644 sale_commission_geo_assign_product_domain/tests/__init__.py create mode 100644 sale_commission_geo_assign_product_domain/tests/test_sale_commission_geo_assign_product_domain.py create mode 100644 sale_commission_geo_assign_product_domain/views/res_partner_view.xml create mode 100644 sale_commission_geo_assign_product_domain/wizards/__init__.py create mode 100644 sale_commission_geo_assign_product_domain/wizards/wizard_geo_assign_partner.py create mode 120000 setup/sale_commission_geo_assign_product_domain/odoo/addons/sale_commission_geo_assign_product_domain create mode 100644 setup/sale_commission_geo_assign_product_domain/setup.py diff --git a/sale_commission_geo_assign/wizard/wizard_geo_assign_partner.py b/sale_commission_geo_assign/wizard/wizard_geo_assign_partner.py index fecff2b5d..adad7c298 100644 --- a/sale_commission_geo_assign/wizard/wizard_geo_assign_partner.py +++ b/sale_commission_geo_assign/wizard/wizard_geo_assign_partner.py @@ -30,9 +30,9 @@ def geo_assign_partner(self): % partner.display_name ) for agent in agents: - if agent.is_assignable(partner): - self.update_data(partner, agent) + self.update_partner_data(partner, agent) @api.model - def update_data(self, partner, agent): - partner.agent_ids = [(4, agent.id)] + def update_partner_data(self, partner, agent): + if agent.is_assignable(partner): + partner.agent_ids = [(4, agent.id)] diff --git a/sale_commission_geo_assign_product_domain/README.rst b/sale_commission_geo_assign_product_domain/README.rst new file mode 100644 index 000000000..2640b32ff --- /dev/null +++ b/sale_commission_geo_assign_product_domain/README.rst @@ -0,0 +1,92 @@ +========================================= +Sale Commission Geo Assign Product Domain +========================================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:c1e975a6df363c2305b48f499b520ac68c97d53570ad5f3f3b4654db2befc99c + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github + :target: https://github.com/OCA/commission/tree/14.0/sale_commission_geo_assign_product_domain + :alt: OCA/commission +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/commission-14-0/commission-14-0-sale_commission_geo_assign_product_domain + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/commission&target_branch=14.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This is a bridge module between sale_commission_product_criteria_domain and sale_commission_geo_assign. It allows to address the following use case: + +- Assign Agent 1 to customers with address in Spain, and restrict Agent 1's applicable commission type lines to those related to group "Spain"; + +- Assign Agent 1 to customers with address in Italy, and restrict Agent 1's applicable commission type lines to those related to group "Italy". + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +In agents with assigned commission type "Product criteria (with restrictions)" it's now possible to set more than one geographic criteria for assignation. Each geo-assignation line must have at least one commission type line group set. + +Usage +===== + +Use server action "Add agents with geo assign" on partners as per sale_commission_geo_assign behavior. Lines in table "Commission items group" will be populated with the commission item groups set in agent's geo-assignation criteria. + +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 to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* PyTech SRL +* Ooops404 + +Contributors +~~~~~~~~~~~~ + +* PyTech SRL +* Ooops404 + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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/commission `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_commission_geo_assign_product_domain/__init__.py b/sale_commission_geo_assign_product_domain/__init__.py new file mode 100644 index 000000000..dd0957955 --- /dev/null +++ b/sale_commission_geo_assign_product_domain/__init__.py @@ -0,0 +1,5 @@ +# Copyright 2023 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import models +from . import wizards diff --git a/sale_commission_geo_assign_product_domain/__manifest__.py b/sale_commission_geo_assign_product_domain/__manifest__.py new file mode 100644 index 000000000..4a0be2cd3 --- /dev/null +++ b/sale_commission_geo_assign_product_domain/__manifest__.py @@ -0,0 +1,26 @@ +# Copyright 2023 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Sale Commission Geo Assign Product Domain", + "summary": "Bridge module between " + "sale_commission_product_criteria_domain and " + "sale_commission_geo_assign", + "version": "14.0.1.0.0", + "author": "PyTech SRL, Ooops404, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/commission", + "category": "Sales Management", + "license": "AGPL-3", + "depends": [ + "sale_commission_geo_assign", + "sale_commission_product_criteria_domain", + ], + "data": [ + "security/ir.model.access.csv", + "views/res_partner_view.xml", + ], + "demo": [], + "application": False, + "installable": True, + "auto_install": True, +} diff --git a/sale_commission_geo_assign_product_domain/models/__init__.py b/sale_commission_geo_assign_product_domain/models/__init__.py new file mode 100644 index 000000000..581f572bd --- /dev/null +++ b/sale_commission_geo_assign_product_domain/models/__init__.py @@ -0,0 +1,5 @@ +# Copyright 2023 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import res_partner +from . import res_partner_commission_group diff --git a/sale_commission_geo_assign_product_domain/models/res_partner.py b/sale_commission_geo_assign_product_domain/models/res_partner.py new file mode 100644 index 000000000..a09cd5eec --- /dev/null +++ b/sale_commission_geo_assign_product_domain/models/res_partner.py @@ -0,0 +1,26 @@ +# Copyright 2023 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class ResPartner(models.Model): + _inherit = "res.partner" + + commission_geo_group_ids = fields.One2many( + comodel_name="res.partner.commission.group", + inverse_name="partner_id", + ondelete="cascade", + ) + + @api.onchange("commission_type") + def _onchange_commission_type(self): + if self.commission_type == "product_restricted": + self.write( + { + "agent_country_ids": False, + "agent_state_ids": False, + "agent_zip_from": False, + "agent_zip_to": False, + } + ) diff --git a/sale_commission_geo_assign_product_domain/models/res_partner_commission_group.py b/sale_commission_geo_assign_product_domain/models/res_partner_commission_group.py new file mode 100644 index 000000000..97a1b993d --- /dev/null +++ b/sale_commission_geo_assign_product_domain/models/res_partner_commission_group.py @@ -0,0 +1,46 @@ +# Copyright 2023 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class ResPartnerCommissionGroup(models.Model): + _name = "res.partner.commission.group" + _description = "Partner Commission Groups by Geolocation" + + partner_id = fields.Many2one("res.partner", required=True) + country_ids = fields.Many2many("res.country", string="Country") + state_ids = fields.Many2many("res.country.state", string="State") + zip_from = fields.Char("Zip From", help="ZIP range where this agent operates") + zip_to = fields.Char("Zip To", help="ZIP range where this agent operates") + + commission_group_ids = fields.Many2many( + "commission.items.group", + required=True, + domain="[('id', 'in', allowed_commission_group_ids)]", + ) + + allowed_commission_group_ids = fields.Many2many( + related="partner_id.allowed_commission_group_ids" + ) + + def is_assignable(self, partner): + # Check if line (self) is assignable to 'partner' + self.ensure_one() + if ( + not self.country_ids + and not self.state_ids + and not self.zip_from + and not self.zip_to + ): + # if no criteria set on agent, agent is excluded + return False + if self.country_ids and partner.country_id not in self.country_ids: + return False + if self.state_ids and partner.state_id not in self.state_ids: + return False + if self.zip_from and (partner.zip or "").upper() < self.zip_from.upper(): + return False + if self.zip_to and (partner.zip or "").upper() > self.zip_to.upper(): + return False + return True diff --git a/sale_commission_geo_assign_product_domain/readme/CONFIGURE.rst b/sale_commission_geo_assign_product_domain/readme/CONFIGURE.rst new file mode 100644 index 000000000..fdf597a05 --- /dev/null +++ b/sale_commission_geo_assign_product_domain/readme/CONFIGURE.rst @@ -0,0 +1 @@ +In agents with assigned commission type "Product criteria (with restrictions)" it's now possible to set more than one geographic criteria for assignation. Each geo-assignation line must have at least one commission type line group set. diff --git a/sale_commission_geo_assign_product_domain/readme/CONTRIBUTORS.rst b/sale_commission_geo_assign_product_domain/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..2cb9791fa --- /dev/null +++ b/sale_commission_geo_assign_product_domain/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* PyTech SRL +* Ooops404 diff --git a/sale_commission_geo_assign_product_domain/readme/DESCRIPTION.rst b/sale_commission_geo_assign_product_domain/readme/DESCRIPTION.rst new file mode 100644 index 000000000..c5768c00f --- /dev/null +++ b/sale_commission_geo_assign_product_domain/readme/DESCRIPTION.rst @@ -0,0 +1,5 @@ +This is a bridge module between sale_commission_product_criteria_domain and sale_commission_geo_assign. It allows to address the following use case: + +- Assign Agent 1 to customers with address in Spain, and restrict Agent 1's applicable commission type lines to those related to group "Spain"; + +- Assign Agent 1 to customers with address in Italy, and restrict Agent 1's applicable commission type lines to those related to group "Italy". diff --git a/sale_commission_geo_assign_product_domain/readme/USAGE.rst b/sale_commission_geo_assign_product_domain/readme/USAGE.rst new file mode 100644 index 000000000..b4bd80f0a --- /dev/null +++ b/sale_commission_geo_assign_product_domain/readme/USAGE.rst @@ -0,0 +1 @@ +Use server action "Add agents with geo assign" on partners as per sale_commission_geo_assign behavior. Lines in table "Commission items group" will be populated with the commission item groups set in agent's geo-assignation criteria. diff --git a/sale_commission_geo_assign_product_domain/security/ir.model.access.csv b/sale_commission_geo_assign_product_domain/security/ir.model.access.csv new file mode 100644 index 000000000..35b591d05 --- /dev/null +++ b/sale_commission_geo_assign_product_domain/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_res_partner_commission_group,access_res_partner_commission_group,model_res_partner_commission_group,sales_team.group_sale_manager,1,1,1,1 diff --git a/sale_commission_geo_assign_product_domain/static/description/icon.png b/sale_commission_geo_assign_product_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_geo_assign_product_domain/static/description/index.html b/sale_commission_geo_assign_product_domain/static/description/index.html new file mode 100644 index 000000000..5f7c9ba45 --- /dev/null +++ b/sale_commission_geo_assign_product_domain/static/description/index.html @@ -0,0 +1,437 @@ + + + + + + +Sale Commission Geo Assign Product Domain + + + +
+

Sale Commission Geo Assign Product Domain

+ + +

Beta License: AGPL-3 OCA/commission Translate me on Weblate Try me on Runboat

+

This is a bridge module between sale_commission_product_criteria_domain and sale_commission_geo_assign. It allows to address the following use case:

+
    +
  • Assign Agent 1 to customers with address in Spain, and restrict Agent 1’s applicable commission type lines to those related to group “Spain”;
    • +
  • Assign Agent 1 to customers with address in Italy, and restrict Agent 1’s applicable commission type lines to those related to group “Italy”.
    • +
+

Table of contents

+ +
+

Configuration

+

In agents with assigned commission type “Product criteria (with restrictions)” it’s now possible to set more than one geographic criteria for assignation. Each geo-assignation line must have at least one commission type line group set.

+
+
+

Usage

+

Use server action “Add agents with geo assign” on partners as per sale_commission_geo_assign behavior. Lines in table “Commission items group” will be populated with the commission item groups set in agent’s geo-assignation criteria.

+
+
+

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 to smash it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • PyTech SRL
    • +
  • Ooops404
    • +
+
+
+

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/commission project on GitHub.

+

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

+
+
+
+ + diff --git a/sale_commission_geo_assign_product_domain/tests/__init__.py b/sale_commission_geo_assign_product_domain/tests/__init__.py new file mode 100644 index 000000000..d2eeaa0c1 --- /dev/null +++ b/sale_commission_geo_assign_product_domain/tests/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2023 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import test_sale_commission_geo_assign_product_domain diff --git a/sale_commission_geo_assign_product_domain/tests/test_sale_commission_geo_assign_product_domain.py b/sale_commission_geo_assign_product_domain/tests/test_sale_commission_geo_assign_product_domain.py new file mode 100644 index 000000000..4b809d21e --- /dev/null +++ b/sale_commission_geo_assign_product_domain/tests/test_sale_commission_geo_assign_product_domain.py @@ -0,0 +1,122 @@ +# Copyright 2023 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +import odoo.tests.common as common + + +class TestSaleCommissionGeoAssignProductDomain(common.TransactionCase): + def setUp(self): + super(TestSaleCommissionGeoAssignProductDomain, self).setUp() + self.partner_model = self.env["res.partner"] + self.commission_group_model = self.env["res.partner.commission.group"] + self.commission_item_group_model = self.env["commission.items.group"] + self.wizard_model = self.env["wizard.geo.assign.partner"] + + self.country_italy = self.env.ref("base.it") + self.country_spain = self.env.ref("base.es") + self.state_genova = self.env.ref("base.state_it_ge") + + self.commission_rules = self.env.ref( + "sale_commission_product_criteria.demo_commission_rules" + ) + self.commission_rules_restrict = self.env.ref( + "sale_commission_product_criteria_domain.demo_commission_rules_restrict" + ) + + self.cig_italy = self.env.ref( + "sale_commission_product_criteria_domain.demo_cig_italy" + ) + self.cig_spain = self.env.ref( + "sale_commission_product_criteria_domain.demo_cig_spain" + ) + self.cig_empty = self.commission_item_group_model.create( + { + "name": "Empty", + "commission_ids": [(6, 0, [self.commission_rules_restrict.id])], + } + ) + + def test_geo_assign(self): + c_it = self.partner_model.create( + { + "name": "Customer Italy", + "country_id": self.country_italy.id, + "state_id": self.state_genova.id, + } + ) + c_es = self.partner_model.create( + { + "name": "Customer Spain", + "country_id": self.country_spain.id, + } + ) + agent = self.partner_model.create( + { + "name": "Agent Spain and Italy", + "agent": True, + "commission_id": self.commission_rules_restrict.id, + "allowed_commission_group_ids": [ + (6, 0, [self.cig_italy.id, self.cig_spain.id]) + ], + } + ) + + self.commission_group_model.create( + [ + { + "partner_id": agent.id, + "country_ids": [(6, 0, [self.country_italy.id])], + "state_ids": [(6, 0, [self.state_genova.id])], + "commission_group_ids": [(6, 0, [self.cig_italy.id])], + }, + { + "partner_id": agent.id, + "country_ids": [(6, 0, [self.country_spain.id])], + "commission_group_ids": [(6, 0, [self.cig_spain.id])], + }, + { + "partner_id": agent.id, + "commission_group_ids": [(6, 0, [self.cig_empty.id])], + }, + ] + ) + + wizard = self.wizard_model.with_context(active_ids=[c_it.id, c_es.id]).create( + {} + ) + wizard.geo_assign_partner() + + self.assertEqual(c_it.agent_ids, agent) + self.assertEqual(c_it.commission_item_agent_ids.group_ids, self.cig_italy) + + self.assertEqual(c_es.agent_ids, agent) + self.assertEqual(c_es.commission_item_agent_ids.group_ids, self.cig_spain) + + def test_change_commission_type(self): + agent = self.partner_model.create( + { + "name": "Agent Spain and Italy", + "agent": True, + "commission_id": self.commission_rules.id, + "allowed_commission_group_ids": [ + (6, 0, [self.cig_italy.id, self.cig_spain.id]) + ], + "agent_country_ids": [(6, 0, [self.country_italy.id])], + "agent_state_ids": [(6, 0, [self.state_genova.id])], + "agent_zip_from": 31234, + "agent_zip_to": 31333, + } + ) + self.assertNotEquals(agent.commission_type, "product_restricted") + + agent.write( + { + "commission_id": self.commission_rules_restrict.id, + } + ) + self.assertEqual(agent.commission_type, "product_restricted") + agent._onchange_commission_type() + self.assertFalse(agent.agent_country_ids) + self.assertFalse(agent.agent_state_ids) + self.assertFalse(agent.agent_zip_from) + self.assertFalse(agent.agent_zip_to) diff --git a/sale_commission_geo_assign_product_domain/views/res_partner_view.xml b/sale_commission_geo_assign_product_domain/views/res_partner_view.xml new file mode 100644 index 000000000..840f24af8 --- /dev/null +++ b/sale_commission_geo_assign_product_domain/views/res_partner_view.xml @@ -0,0 +1,52 @@ + + + + + view_partner_form_agent_geo_assign + res.partner + + + + {'invisible': [('commission_type','=','product_restricted')]} + + + {'invisible': [('commission_type','=','product_restricted')]} + + + {'invisible': [('commission_type','=','product_restricted')]} + + + + + + + + + + + + + + + + + diff --git a/sale_commission_geo_assign_product_domain/wizards/__init__.py b/sale_commission_geo_assign_product_domain/wizards/__init__.py new file mode 100644 index 000000000..44fd1ecee --- /dev/null +++ b/sale_commission_geo_assign_product_domain/wizards/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2023 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import wizard_geo_assign_partner diff --git a/sale_commission_geo_assign_product_domain/wizards/wizard_geo_assign_partner.py b/sale_commission_geo_assign_product_domain/wizards/wizard_geo_assign_partner.py new file mode 100644 index 000000000..e742da021 --- /dev/null +++ b/sale_commission_geo_assign_product_domain/wizards/wizard_geo_assign_partner.py @@ -0,0 +1,33 @@ +# Copyright 2023 Ooops404 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import api, models + + +class WizardGeoAssign(models.TransientModel): + _inherit = "wizard.geo.assign.partner" + + @api.model + def update_partner_data(self, partner, agent): + if agent.commission_type == "product_restricted": + for line in agent.commission_geo_group_ids: + if line.is_assignable(partner): + partner.agent_ids = [(4, agent.id)] + partner.commission_item_agent_ids = [ + ( + 0, + 0, + { + "agent_id": agent.id, + "group_ids": [ + ( + 6, + 0, + line.mapped("commission_group_ids.id"), + ) + ], + }, + ) + ] + else: + super().update_partner_data(partner, agent) diff --git a/setup/sale_commission_geo_assign_product_domain/odoo/addons/sale_commission_geo_assign_product_domain b/setup/sale_commission_geo_assign_product_domain/odoo/addons/sale_commission_geo_assign_product_domain new file mode 120000 index 000000000..5df734f2b --- /dev/null +++ b/setup/sale_commission_geo_assign_product_domain/odoo/addons/sale_commission_geo_assign_product_domain @@ -0,0 +1 @@ +../../../../sale_commission_geo_assign_product_domain \ No newline at end of file diff --git a/setup/sale_commission_geo_assign_product_domain/setup.py b/setup/sale_commission_geo_assign_product_domain/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/sale_commission_geo_assign_product_domain/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)