Skip to content

Commit

Permalink
Merge pull request #461 from OCA/16.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/commission (16.0)
  • Loading branch information
bt-admin authored Jun 25, 2024
2 parents 9bd96ba + 589d071 commit c6badaf
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ addon | version | maintainers | summary
[sale_commission](sale_commission/) | 16.0.1.0.2 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Sales commissions
[sale_commission_product_criteria](sale_commission_product_criteria/) | 16.0.1.0.0 | [![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/) | 16.0.1.0.0 | [![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/) | 16.0.1.0.0 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | Sale Commission Product Criteria Domain
[sale_commission_product_criteria_domain](sale_commission_product_criteria_domain/) | 16.0.1.0.1 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | Sale Commission Product Criteria Domain
[sale_commission_salesman](sale_commission_salesman/) | 16.0.1.0.0 | | Sales commissions from salesman

[//]: # (end addons)
Expand Down
2 changes: 1 addition & 1 deletion sale_commission_product_criteria_domain/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:163032362b1420f26a24755c50985afa774a2d1243a187a5086948a14e65e74e
!! source digest: sha256:68f05649f2fa798589de5a6b032c3bcaf1e5df63e549aee0c672e27fac4ee3a5
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
4 changes: 2 additions & 2 deletions sale_commission_product_criteria_domain/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# © 2023 ooops404
# Copyright 2023 ooops404
# Copyright 2023 Simone Rubino - Aion Tech
# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html
{
"name": "Sale Commission Product Criteria Domain",
"version": "16.0.1.0.0",
"version": "16.0.1.0.1",
"author": "Ilyas," "Ooops404," "Odoo Community Association (OCA)",
"contributors": ["Ilyas"],
"maintainers": ["ilyasProgrammer"],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# © 2023 ooops404
# Copyright 2023 ooops404
# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html
from odoo import api, models

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# © 2023 ooops404
# Copyright 2023 ooops404
# Copyright 2023 Simone Rubino - Aion Tech
# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html
from odoo import _, api, exceptions, fields, models
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# © 2023 ooops404
# Copyright 2023 ooops404
# Copyright 2023 Simone Rubino - Aion Tech
# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html
from odoo import _, api, exceptions, fields, models
Expand Down
6 changes: 6 additions & 0 deletions sale_commission_product_criteria_domain/models/partner.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,10 @@ def write(self, vals):
and partner.allowed_commission_group_ids
):
partner.allowed_commission_group_ids = False
if "agent" in vals.keys() and not vals["agent"]:
# not agent anymore - remove related cia's
cia_records = self.env["commission.item.agent"].search(
[("agent_id", "=", partner.id)]
)
cia_records.unlink()
return res
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# © 2023 ooops404
# Copyright 2023 ooops404
# Copyright 2023 Simone Rubino - Aion Tech
# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html
from odoo import models
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# © 2023 ooops404
# Copyright 2023 ooops404
# Copyright 2023 Simone Rubino - Aion Tech
# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html
from odoo import api, models
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:163032362b1420f26a24755c50985afa774a2d1243a187a5086948a14e65e74e
!! source digest: sha256:68f05649f2fa798589de5a6b032c3bcaf1e5df63e549aee0c672e27fac4ee3a5
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/16.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-16-0/commission-16-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=16.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>
Expand Down

0 comments on commit c6badaf

Please sign in to comment.