Skip to content

Commit

Permalink
Merge pull request #382 from OCA/14.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/commission (14.0)
  • Loading branch information
bt-admin authored Dec 12, 2023
2 parents 93f66fc + 291882e commit 63402cc
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 7 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_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.0 | [![eLBati](https://github.com/eLBati.png?size=30px)](https://github.com/eLBati) | Assign agents to partners according to their location
[sale_commission_geo_assign_product_domain](sale_commission_geo_assign_product_domain/) | 14.0.1.2.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.2.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_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.3 | [![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
Expand Down
2 changes: 1 addition & 1 deletion sale_commission_geo_assign_product_domain/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:bf7525d9ac78c30aa36e222718f07855e96e9e58c2b92b5c7b65b545131c3e36
!! source digest: sha256:04e0a92dddcd73025b0d16ac486fd49179385fa2cabd2e5f0bd6ab6243e3b5ed
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion sale_commission_geo_assign_product_domain/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"summary": "Bridge module between "
"sale_commission_product_criteria_domain and "
"sale_commission_geo_assign",
"version": "14.0.1.2.0",
"version": "14.0.1.2.1",
"author": "PyTech SRL, Ooops404, Odoo Community Association (OCA)",
"maintainers": ["aleuffre", "renda-dev"],
"website": "https://github.com/OCA/commission",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ class ResPartner(models.Model):
commission_geo_group_ids = fields.One2many(
comodel_name="res.partner.commission.group",
inverse_name="partner_id",
ondelete="cascade",
)

@api.onchange("commission_type")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class ResPartnerCommissionGroup(models.Model):
_name = "res.partner.commission.group"
_description = "Partner Commission Groups by Geolocation"

partner_id = fields.Many2one("res.partner", required=True)
partner_id = fields.Many2one("res.partner", ondelete="cascade", 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")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
Expand Down Expand Up @@ -367,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:bf7525d9ac78c30aa36e222718f07855e96e9e58c2b92b5c7b65b545131c3e36
!! source digest: sha256:04e0a92dddcd73025b0d16ac486fd49179385fa2cabd2e5f0bd6ab6243e3b5ed
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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>
Expand Down

0 comments on commit 63402cc

Please sign in to comment.