diff --git a/README.md b/README.md index 58348c355..8f930ef3d 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,8 @@ addon | version | maintainers | summary [sale_commission_geo_assign_product_domain](sale_commission_geo_assign_product_domain/) | 14.0.1.3.2 | [![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.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) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | 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](sale_commission_product_criteria/) | 14.0.1.1.5 | [![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.3 | [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) [![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) | Advanced commissions rules with discount [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 diff --git a/sale_commission_product_criteria/README.rst b/sale_commission_product_criteria/README.rst index bb38f4865..184b2244a 100644 --- a/sale_commission_product_criteria/README.rst +++ b/sale_commission_product_criteria/README.rst @@ -7,7 +7,7 @@ Sale Commission Product Criteria !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:85fe902e66b93499066c57dc66a2b4a159219acd3db4413d884eb5be1ac7b6b5 + !! source digest: sha256:0729b7f70261889824983bb4866585a95298b64df588d2fd9aeec97233cb3900 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/sale_commission_product_criteria/__manifest__.py b/sale_commission_product_criteria/__manifest__.py index 36e4e8d42..6e872260a 100644 --- a/sale_commission_product_criteria/__manifest__.py +++ b/sale_commission_product_criteria/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Sale Commission Product Criteria", "summary": "Advanced commissions rules", - "version": "14.0.1.1.4", + "version": "14.0.1.1.5", "author": "Ilyas, Ooops404, Odoo Community Association (OCA)", "maintainers": ["ilyasProgrammer"], "website": "https://github.com/OCA/commission", diff --git a/sale_commission_product_criteria/static/description/index.html b/sale_commission_product_criteria/static/description/index.html index f4d24e5bd..e587abc0a 100644 --- a/sale_commission_product_criteria/static/description/index.html +++ b/sale_commission_product_criteria/static/description/index.html @@ -8,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -274,7 +275,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -300,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -366,7 +367,7 @@

Sale Commission Product Criteria

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:85fe902e66b93499066c57dc66a2b4a159219acd3db4413d884eb5be1ac7b6b5 +!! source digest: sha256:0729b7f70261889824983bb4866585a95298b64df588d2fd9aeec97233cb3900 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

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

This module allows to set in the same Commission Type different commission rates according to the product on SO/invoice line.

@@ -432,7 +433,9 @@

Contributors

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +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.

diff --git a/sale_commission_product_criteria_discount/README.rst b/sale_commission_product_criteria_discount/README.rst index 894a60984..6d838fc53 100644 --- a/sale_commission_product_criteria_discount/README.rst +++ b/sale_commission_product_criteria_discount/README.rst @@ -7,7 +7,7 @@ Sale Commission Product Criteria Discount !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:04a63c8500d3941a0513d79bf38050ba021150ffee571494a93e643bacddf524 + !! source digest: sha256:970a254d4a38aa26aee82c79b3b65b5b2a55cc02dacb525eb6f6a38ed99e7a32 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/sale_commission_product_criteria_discount/__manifest__.py b/sale_commission_product_criteria_discount/__manifest__.py index e31e6c8b0..ea3cb85ca 100644 --- a/sale_commission_product_criteria_discount/__manifest__.py +++ b/sale_commission_product_criteria_discount/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Sale Commission Product Criteria Discount", "summary": "Advanced commissions rules with discount", - "version": "14.0.1.0.2", + "version": "14.0.1.0.3", "author": "Ilyas," "Ooops404," "Odoo Community Association (OCA)", "contributors": ["Ilyas"], "maintainers": [ diff --git a/sale_commission_product_criteria_discount/static/description/index.html b/sale_commission_product_criteria_discount/static/description/index.html index 4490cfe0b..5c51c09ca 100644 --- a/sale_commission_product_criteria_discount/static/description/index.html +++ b/sale_commission_product_criteria_discount/static/description/index.html @@ -367,7 +367,7 @@

Sale Commission Product Criteria Discount

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:04a63c8500d3941a0513d79bf38050ba021150ffee571494a93e643bacddf524 +!! source digest: sha256:970a254d4a38aa26aee82c79b3b65b5b2a55cc02dacb525eb6f6a38ed99e7a32 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

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

This module extends sale_commission_product_criteria to allow user to restrict the commission granted to agent on a Sale Order Line according to the discount applied on the same line.