Merge pull request #464 from OCA/14.0

Syncing from upstream OCA/commission (14.0)
brain-tec · Jul 3, 2024 · dde7096 · dde7096
2 parents fea6c98 + 42e8037
commit dde7096
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -28,12 +28,12 @@ addon | version | maintainers | summary
 [sale_commission_delegated_partner](sale_commission_delegated_partner/) | 14.0.1.0.1 |  | Allow to delegate the invoices of agent to a delegate partner
 [sale_commission_formula](sale_commission_formula/) | 14.0.1.0.0 |  | Sale commissions computed by formulas
 [sale_commission_geo_assign](sale_commission_geo_assign/) | 14.0.1.1.2 | [![eLBati](https://github.com/eLBati.png?size=30px)](https://github.com/eLBati) [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Assign agents to partners according to their location
-[sale_commission_geo_assign_product_domain](sale_commission_geo_assign_product_domain/) | 14.0.1.3.0 | [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) | Bridge module between sale_commission_product_criteria_domain and sale_commission_geo_assign
+[sale_commission_geo_assign_product_domain](sale_commission_geo_assign_product_domain/) | 14.0.1.3.1 | [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) | Bridge module between sale_commission_product_criteria_domain and sale_commission_geo_assign
 [sale_commission_partial_settlement](sale_commission_partial_settlement/) | 14.0.1.0.0 |  | Sales commissions based on paid amount
 [sale_commission_pricelist](sale_commission_pricelist/) | 14.0.1.0.0 |  | Sales commissions by pricelist
 [sale_commission_product_criteria](sale_commission_product_criteria/) | 14.0.1.1.4 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | Advanced commissions rules
 [sale_commission_product_criteria_discount](sale_commission_product_criteria_discount/) | 14.0.1.0.2 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | Advanced commissions rules with discount
-[sale_commission_product_criteria_domain](sale_commission_product_criteria_domain/) | 14.0.1.0.10 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Sale Commission Product Criteria Domain
+[sale_commission_product_criteria_domain](sale_commission_product_criteria_domain/) | 14.0.1.0.11 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Sale Commission Product Criteria Domain
 [sale_commission_queued](sale_commission_queued/) | 14.0.1.0.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Sales commissions queued
 [sale_commission_salesman](sale_commission_salesman/) | 14.0.1.0.1 |  | Sales commissions from salesman
 [sale_quick_commission](sale_quick_commission/) | 14.0.1.0.0 |  | Makes modules compatible

diff --git a/sale_commission_geo_assign_product_domain/README.rst b/sale_commission_geo_assign_product_domain/README.rst
@@ -7,7 +7,7 @@ Sale Commission Geo Assign Product Domain
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:acae30f5812c5a48e9beb4346d12a412b1f1f728032748e6a42f719c677db989
+   !! source digest: sha256:6c8a98754ee6b4f4028ee96cf0a38416f6ad8bc5e2b74447bc9fc50f6b8012f0
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/sale_commission_geo_assign_product_domain/__manifest__.py b/sale_commission_geo_assign_product_domain/__manifest__.py
@@ -6,7 +6,7 @@
     "summary": "Bridge module between "
     "sale_commission_product_criteria_domain and "
     "sale_commission_geo_assign",
-    "version": "14.0.1.3.0",
+    "version": "14.0.1.3.1",
     "author": "PyTech SRL, Ooops404, Odoo Community Association (OCA)",
     "maintainers": ["aleuffre", "renda-dev"],
     "website": "https://github.com/OCA/commission",

diff --git a/sale_commission_geo_assign_product_domain/models/res_partner.py b/sale_commission_geo_assign_product_domain/models/res_partner.py
@@ -23,3 +23,12 @@ def _onchange_commission_type(self):
                     "agent_zip_to": False,
                 }
             )
+
+    @api.onchange("commission_id")
+    def _onchange_commission_id(self):
+        super()._onchange_commission_id()
+        self.update(
+            {
+                "commission_geo_group_ids": [(5, 0, 0)],
+            }
+        )
diff --git a/sale_commission_geo_assign_product_domain/static/description/index.html b/sale_commission_geo_assign_product_domain/static/description/index.html
@@ -366,7 +366,7 @@ <h1 class="title">Sale Commission Geo Assign Product Domain</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:acae30f5812c5a48e9beb4346d12a412b1f1f728032748e6a42f719c677db989
+!! source digest: sha256:6c8a98754ee6b4f4028ee96cf0a38416f6ad8bc5e2b74447bc9fc50f6b8012f0
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/commission/tree/14.0/sale_commission_geo_assign_product_domain"><img alt="OCA/commission" src="https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/commission-14-0/commission-14-0-sale_commission_geo_assign_product_domain"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/commission&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This is a bridge module between sale_commission_product_criteria_domain and sale_commission_geo_assign. It allows to address the following use case:</p>

diff --git a/sale_commission_product_criteria_domain/README.rst b/sale_commission_product_criteria_domain/README.rst
@@ -7,7 +7,7 @@ Sale Commission Product Criteria Domain
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d04c185930eefa147cfc546bb9bc65444cf7a27b589980178eb0f077716fb5aa
+   !! source digest: sha256:8c92dfa84b1fdd522cee5ff3b3c2570e4ac1c06096c427d43fadbea4ebea8a0f
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/sale_commission_product_criteria_domain/__manifest__.py b/sale_commission_product_criteria_domain/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html
 {
     "name": "Sale Commission Product Criteria Domain",
-    "version": "14.0.1.0.10",
+    "version": "14.0.1.0.11",
     "author": "Ilyas," "Ooops404," "Odoo Community Association (OCA)",
     "contributors": ["Ilyas"],
     "maintainers": ["ilyasProgrammer", "aleuffre", "renda-dev", "PicchiSeba"],

diff --git a/sale_commission_product_criteria_domain/models/partner.py b/sale_commission_product_criteria_domain/models/partner.py
@@ -62,6 +62,14 @@ def _onchange_agent_ids(self):
                     {"commission_item_agent_ids": [(0, 0, line) for line in to_create]}
                 )
 
+    @api.onchange("commission_id")
+    def _onchange_commission_id(self):
+        self.update(
+            {
+                "allowed_commission_group_ids": [(5, 0, 0)],
+            }
+        )
+
     def write(self, vals):
         res = super().write(vals)
         for partner in self:

diff --git a/sale_commission_product_criteria_domain/static/description/index.html b/sale_commission_product_criteria_domain/static/description/index.html
@@ -366,7 +366,7 @@ <h1 class="title">Sale Commission Product Criteria Domain</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:d04c185930eefa147cfc546bb9bc65444cf7a27b589980178eb0f077716fb5aa
+!! source digest: sha256:8c92dfa84b1fdd522cee5ff3b3c2570e4ac1c06096c427d43fadbea4ebea8a0f
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/commission/tree/14.0/sale_commission_product_criteria_domain"><img alt="OCA/commission" src="https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/commission-14-0/commission-14-0-sale_commission_product_criteria_domain"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/commission&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows to limit applied commission items for specific groups.</p>