From e719df295d49e4b531e22a8fab6ec1f1b93eadbe Mon Sep 17 00:00:00 2001 From: Ilyas Date: Tue, 15 Aug 2023 10:18:20 +0200 Subject: [PATCH 1/3] [IMP] sale_commission_product_criteria: no need to order items by id --- .../models/sale_commission_line_mixin.py | 2 +- sale_commission_product_criteria/views/views.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sale_commission_product_criteria/models/sale_commission_line_mixin.py b/sale_commission_product_criteria/models/sale_commission_line_mixin.py index a7c43a1b6..5f97b5859 100644 --- a/sale_commission_product_criteria/models/sale_commission_line_mixin.py +++ b/sale_commission_product_criteria/models/sale_commission_line_mixin.py @@ -41,7 +41,7 @@ def _get_commission_items(self, commission, product): AND (item.commission_id = %s) AND (item.active = TRUE) ORDER BY - item.applied_on, categ.complete_name desc, item.id desc + item.applied_on, categ.complete_name desc """, ( product.product_tmpl_id.ids, diff --git a/sale_commission_product_criteria/views/views.xml b/sale_commission_product_criteria/views/views.xml index b40929b20..7f7673066 100644 --- a/sale_commission_product_criteria/views/views.xml +++ b/sale_commission_product_criteria/views/views.xml @@ -99,7 +99,6 @@ name="commission_id" invisible="context.get('hide_commission_id')" options="{'no_create': True, 'no_open': 1}" - domain="[('commission_type', '=', 'product')]" /> From 44ff7da60af34442504e841f084861bd1c582089 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 15 Aug 2023 08:28:47 +0000 Subject: [PATCH 2/3] sale_commission_product_criteria 14.0.1.1.0 --- sale_commission_product_criteria/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale_commission_product_criteria/__manifest__.py b/sale_commission_product_criteria/__manifest__.py index e2a22d705..4ebf96322 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.0.3", + "version": "14.0.1.1.0", "author": "Ilyas, Ooops404, Odoo Community Association (OCA)", "maintainers": ["ilyasProgrammer"], "website": "https://github.com/OCA/commission", From 2126be8e994d7b2a038cbee6ac3f886c508b42ae Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 15 Aug 2023 08:28:52 +0000 Subject: [PATCH 3/3] [UPD] addons table in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2102b30f0..7eb630660 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ addon | version | maintainers | summary [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.0.1 | [![eLBati](https://github.com/eLBati.png?size=30px)](https://github.com/eLBati) | Assign agents to partners according to their location [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.0.3 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | Advanced commissions rules +[sale_commission_product_criteria](sale_commission_product_criteria/) | 14.0.1.1.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/) | 14.0.1.0.1 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | Advanced commissions rules with discount [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.0 | | Sales commissions from salesman