Merge pull request #301 from OCA/14.0

Syncing from upstream OCA/commission (14.0)

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

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",

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,

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')]"
                             />
                             <field name="applied_on" widget="radio" />
                             <field name="based_on" invisible="1" />