odoo-addon-sale-commission-product-criteria 16.0.1.0.1.1__py3-none-any.whl → 16.0.2.0.0__py3-none-any.whl

odoo/addons/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:42e4737070e1268a622af8ffacf3e25bacd99ec5696dbfd5c10f92ea0ab09a4d
+   !! source digest: sha256:4bd16205ce53357916f35f63494314b7c39a51d4b787e42f7e13b0eb69fc90f0
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

odoo/addons/sale_commission_product_criteria/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Sale Commission Product Criteria",
     "summary": "Advanced commissions rules",
-    "version": "16.0.1.0.1",
+    "version": "16.0.2.0.0",
     "author": "Ilyas, Ooops404, Odoo Community Association (OCA)",
     "maintainers": ["ilyasProgrammer"],
     "website": "https://github.com/OCA/commission",

odoo/addons/sale_commission_product_criteria/models/sale_commission_line_mixin.py

@@ -18,38 +18,51 @@ class SaleCommissionLineMixin(models.AbstractModel):
         copy=True,
     )
 
-    def _get_commission_items(self, commission, product):
-        # Method replaced
+    def _commission_items_from(self):
+        return """ commission_item AS item
+            LEFT JOIN product_category AS categ ON item.categ_id = categ.id
+        """
+
+    def _commission_items_where(self):
+        return """ (item.product_tmpl_id IS NULL OR item.product_tmpl_id = any(%(prod_tmpls)s))
+            AND (item.product_id IS NULL OR item.product_id = any(%(prod_prods)s))
+            AND (item.categ_id IS NULL OR item.categ_id = any(%(categs)s))
+            AND (item.commission_id = %(commission)s)
+            AND (item.active = TRUE)
+        """
+
+    def _commission_items_order(self):
+        return """item.applied_on,
+            item.based_on,
+            categ.complete_name desc
+        """
+
+    def _commission_items_query(self):
+        return f"""
+            SELECT item.id
+            FROM {self._commission_items_from()}
+            WHERE {self._commission_items_where()}
+            ORDER BY {self._commission_items_order()}
+        """
+
+    def _commission_items_query_params(self, commission, product):
         categ_ids = {}
         categ = product.categ_id
         while categ:
             categ_ids[categ.id] = True
             categ = categ.parent_id
         categ_ids = list(categ_ids)
-        # Select all suitable items. Order by best match
-        # (priority is: all/cat/subcat/product/variant).
+        return {
+            "prod_tmpls": product.product_tmpl_id.ids,
+            "prod_prods": product.ids,
+            "categs": categ_ids,
+            "commission": commission._origin.id,
+        }
+
+    def _get_commission_items(self, commission, product):
         self.env.cr.execute(
-            """
-            SELECT
-                item.id
-            FROM
-                commission_item AS item
-            LEFT JOIN product_category AS categ ON item.categ_id = categ.id
-            WHERE
-                (item.product_tmpl_id IS NULL OR item.product_tmpl_id = any(%s))
-                AND (item.product_id IS NULL OR item.product_id = any(%s))
-                AND (item.categ_id IS NULL OR item.categ_id = any(%s))
-                AND (item.commission_id = %s)
-                AND (item.active = TRUE)
-            ORDER BY
-                item.applied_on, item.based_on, categ.complete_name desc
-            """,
-            (
-                product.product_tmpl_id.ids,
-                product.ids,
-                categ_ids,
-                commission._origin.id,  # Added this
-            ),
+            self._commission_items_query(),
+            self._commission_items_query_params(commission, product),
         )
         item_ids = [x[0] for x in self.env.cr.fetchall()]
         return item_ids

odoo/addons/sale_commission_product_criteria/static/description/index.html

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:42e4737070e1268a622af8ffacf3e25bacd99ec5696dbfd5c10f92ea0ab09a4d
+!! source digest: sha256:4bd16205ce53357916f35f63494314b7c39a51d4b787e42f7e13b0eb69fc90f0
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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"><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"><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 set in the same Commission Type different commission rates according to the product on SO/invoice line.</p>

{odoo_addon_sale_commission_product_criteria-16.0.1.0.1.1.dist-info → odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-sale_commission_product_criteria
-Version: 16.0.1.0.1.1
+Version: 16.0.2.0.0
 Summary: Advanced commissions rules
 Home-page: https://github.com/OCA/commission
 Author: Ilyas, Ooops404, Odoo Community Association (OCA)
@@ -23,7 +23,7 @@ Sale Commission Product Criteria
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:42e4737070e1268a622af8ffacf3e25bacd99ec5696dbfd5c10f92ea0ab09a4d
+   !! source digest: sha256:4bd16205ce53357916f35f63494314b7c39a51d4b787e42f7e13b0eb69fc90f0
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_sale_commission_product_criteria-16.0.1.0.1.1.dist-info → odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/sale_commission_product_criteria/README.rst,sha256=rwYdzODj-F2BWZ4dx0wLzRmomD8J7AuWftQ06hlzrPw,4673
+odoo/addons/sale_commission_product_criteria/README.rst,sha256=tA4mAvMbDH3Id_ZbaWkDx0rwyuZ73KJ3-BXgdsDIKAE,4673
 odoo/addons/sale_commission_product_criteria/__init__.py,sha256=X9EJGOE2GtZbS0G82PtSXmWSZ_R8jEM0rlJTDliQjp4,21
-odoo/addons/sale_commission_product_criteria/__manifest__.py,sha256=Wez7mCTV4_dwgBeGFAjtYcGaAAb0HoWEEtZFIk3PL_8,718
+odoo/addons/sale_commission_product_criteria/__manifest__.py,sha256=svvmIsp965MeU_Z1GD5k5bQb53m93ZfiS2X5oA6_kmc,718
 odoo/addons/sale_commission_product_criteria/demo/sale_agent_demo.xml,sha256=8Mij5a1TTFyyIZK0LEoenWh-W4ucTNtwqDAF87EbT34,2665
 odoo/addons/sale_commission_product_criteria/i18n/es.po,sha256=T_MurzPti038XcMfv8rpLdaAL5Xpl7Nh1i-l-GjP0Q0,18388
 odoo/addons/sale_commission_product_criteria/i18n/it.po,sha256=I50Swt_ubusszXWs1wZNjQL5stC2kXT5q0OcnJ8h-88,19641
@@ -9,18 +9,18 @@ odoo/addons/sale_commission_product_criteria/models/__init__.py,sha256=lkOi79dgL
 odoo/addons/sale_commission_product_criteria/models/account_move.py,sha256=Q1cYIDJCmro0SrVUjP2JeQeeTxkOmN6U_99t6D3B-a4,1027
 odoo/addons/sale_commission_product_criteria/models/commission.py,sha256=PmKeTU_Hh7XPZ5XNyhYTpm-sLaV0sMIMHtyWqkFUDyc,9771
 odoo/addons/sale_commission_product_criteria/models/sale.py,sha256=cMxxuZWVmldPoUqKDgU-_BFMC8X292x9l1b6badrhEA,1991
-odoo/addons/sale_commission_product_criteria/models/sale_commission_line_mixin.py,sha256=pbGdRGuKk9l4JE8isznZSkhDtHoGzNyp6C_NTX7dQwM,3065
+odoo/addons/sale_commission_product_criteria/models/sale_commission_line_mixin.py,sha256=Gyu8-uTsNXtUNpKngAihM64IblU7AYAWafKFLGUAl6c,3463
 odoo/addons/sale_commission_product_criteria/models/settlement.py,sha256=c9rhprm8Vz4HHYJ2-5tgs2Gi1UzNmjtAlmEWVw7BuN8,191
 odoo/addons/sale_commission_product_criteria/readme/CONTRIBUTORS.rst,sha256=QY6T07gmiPvozyM8CAFJN6IQBD0SFtwghoDU5fLIIjA,168
 odoo/addons/sale_commission_product_criteria/readme/DESCRIPTION.rst,sha256=7ZEUYQ-wLmMBfizeqrWf09YeCiA7TSdcb-nocTRsUrk,1038
 odoo/addons/sale_commission_product_criteria/readme/USAGE.rst,sha256=opr0MY68l3yNs3rj31HxdAVcFT2wAUpDIntiu5mXuMo,366
 odoo/addons/sale_commission_product_criteria/security/ir.model.access.csv,sha256=l4p29Bw20_pdCUkFc0ApE6mAEohTQOPo5VwmuyYMnZY,324
 odoo/addons/sale_commission_product_criteria/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/sale_commission_product_criteria/static/description/index.html,sha256=jmsX3jB5sCTSKrWrcgn1IbDTAtP41-LqaLvsRZlMnCM,14503
+odoo/addons/sale_commission_product_criteria/static/description/index.html,sha256=qzkWEuRo0LnffgZymGoGm73J5z6OLR6d59vVibgiIHI,14503
 odoo/addons/sale_commission_product_criteria/tests/__init__.py,sha256=gR27hVtH8fvlbCsPJq4JRfSYMXQlBQkjhULr_rcLki0,52
 odoo/addons/sale_commission_product_criteria/tests/test_sale_commission_product_criteria.py,sha256=6SP_rJ7LN486WO_gtRTxdLJotCiFko29J9IKd5gqTCg,8979
 odoo/addons/sale_commission_product_criteria/views/views.xml,sha256=Q2wwfQxtZ3cUMXkAoyrBGpmGDqSFi295pWnSoYBL0bs,10449
-odoo_addon_sale_commission_product_criteria-16.0.1.0.1.1.dist-info/METADATA,sha256=eQjkYYpfmCv0dPLSWNX5XlSDqRqhuunmhHmjf2q5Gpc,5271
-odoo_addon_sale_commission_product_criteria-16.0.1.0.1.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-odoo_addon_sale_commission_product_criteria-16.0.1.0.1.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_sale_commission_product_criteria-16.0.1.0.1.1.dist-info/RECORD,,
+odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info/METADATA,sha256=HtRIvoDRQIN69kVagWVcqfCg1hx0pQ4cleIQCekYwq4,5269
+odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info/RECORD,,