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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. odoo/addons/sale_commission_product_criteria/README.rst +1 -1
  2. odoo/addons/sale_commission_product_criteria/__manifest__.py +1 -1
  3. odoo/addons/sale_commission_product_criteria/i18n/it.po +9 -9
  4. odoo/addons/sale_commission_product_criteria/models/sale_commission_line_mixin.py +38 -25
  5. odoo/addons/sale_commission_product_criteria/static/description/index.html +1 -1
  6. {odoo_addon_sale_commission_product_criteria-16.0.1.0.1.dist-info → odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info}/METADATA +2 -2
  7. {odoo_addon_sale_commission_product_criteria-16.0.1.0.1.dist-info → odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info}/RECORD +9 -9
  8. {odoo_addon_sale_commission_product_criteria-16.0.1.0.1.dist-info → odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info}/WHEEL +1 -1
  9. {odoo_addon_sale_commission_product_criteria-16.0.1.0.1.dist-info → odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info}/top_level.txt +0 -0
odoo/addons/sale_commission_product_criteria/README.rst CHANGED
@@ -7,7 +7,7 @@ Sale Commission Product Criteria
7
7
  !! This file is generated by oca-gen-addon-readme !!
8
8
  !! changes will be overwritten. !!
9
9
  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10
- !! source digest: sha256:42e4737070e1268a622af8ffacf3e25bacd99ec5696dbfd5c10f92ea0ab09a4d
10
+ !! source digest: sha256:4bd16205ce53357916f35f63494314b7c39a51d4b787e42f7e13b0eb69fc90f0
11
11
  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
12
12
 
13
13
  .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
odoo/addons/sale_commission_product_criteria/__manifest__.py CHANGED
@@ -4,7 +4,7 @@
4
4
  {
5
5
  "name": "Sale Commission Product Criteria",
6
6
  "summary": "Advanced commissions rules",
7
- "version": "16.0.1.0.1",
7
+ "version": "16.0.2.0.0",
8
8
  "author": "Ilyas, Ooops404, Odoo Community Association (OCA)",
9
9
  "maintainers": ["ilyasProgrammer"],
10
10
  "website": "https://github.com/OCA/commission",
odoo/addons/sale_commission_product_criteria/i18n/it.po CHANGED
@@ -6,15 +6,15 @@ msgid ""
6
6
  msgstr ""
7
7
  "Project-Id-Version: Odoo Server 14.0\n"
8
8
  "Report-Msgid-Bugs-To: \n"
9
- "PO-Revision-Date: 2023-05-24 12:10+0000\n"
10
- "Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
9
+ "PO-Revision-Date: 2025-03-05 12:06+0000\n"
10
+ "Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
11
11
  "Language-Team: none\n"
12
12
  "Language: it\n"
13
13
  "MIME-Version: 1.0\n"
14
14
  "Content-Type: text/plain; charset=UTF-8\n"
15
15
  "Content-Transfer-Encoding: \n"
16
16
  "Plural-Forms: nplurals=2; plural=n != 1;\n"
17
- "X-Generator: Weblate 4.17\n"
17
+ "X-Generator: Weblate 5.10.2\n"
18
18
 
19
19
  #. module: sale_commission_product_criteria
20
20
  #: model:ir.model.fields,field_description:sale_commission_product_criteria.field_commission_item__active
@@ -362,9 +362,9 @@ msgid ""
362
362
  "Specify a product category if this rule only applies to products belonging "
363
363
  "to this category or its children categories. Keep empty otherwise."
364
364
  msgstr ""
365
- "Specifica una categoria prodotto se questa regola si applica solo ai "
365
+ "Specificare una categoria prodotto se questa regola si applica solo ai "
366
366
  "prodotti appartenenti a questa categoria o alle sue categorie figlie, "
367
- "altrimenti lascia vuoto."
367
+ "altrimenti lasciare vuoto."
368
368
 
369
369
  #. module: sale_commission_product_criteria
370
370
  #: model:ir.model.fields,help:sale_commission_product_criteria.field_commission_item__product_id
@@ -372,8 +372,8 @@ msgid ""
372
372
  "Specify a product if this rule only applies to one product. Keep empty "
373
373
  "otherwise."
374
374
  msgstr ""
375
- "Specifica un prodotto se questa regola si applica solo ad un prodotto, "
376
- "altrimenti lascia vuoto."
375
+ "Specificare un prodotto se questa regola si applica solo ad un prodotto, "
376
+ "altrimenti lasciare vuoto."
377
377
 
378
378
  #. module: sale_commission_product_criteria
379
379
  #: model:ir.model.fields,help:sale_commission_product_criteria.field_commission_item__product_tmpl_id
@@ -381,8 +381,8 @@ msgid ""
381
381
  "Specify a template if this rule only applies to one product template. Keep "
382
382
  "empty otherwise."
383
383
  msgstr ""
384
- "Specifica un modello prodotto se questa regola si applica solo ad un modello "
385
- "prodotto, altrimenti lascia vuoto."
384
+ "Specificare un modello prodotto se questa regola si applica solo ad un "
385
+ "modello prodotto, altrimenti lasciare vuoto."
386
386
 
387
387
  #. module: sale_commission_product_criteria
388
388
  #: code:addons/sale_commission_product_criteria/models/commission.py:0
odoo/addons/sale_commission_product_criteria/models/sale_commission_line_mixin.py CHANGED
@@ -18,38 +18,51 @@ class SaleCommissionLineMixin(models.AbstractModel):
18
18
  copy=True,
19
19
  )
20
20
 
21
- def _get_commission_items(self, commission, product):
22
- # Method replaced
21
+ def _commission_items_from(self):
22
+ return """ commission_item AS item
23
+ LEFT JOIN product_category AS categ ON item.categ_id = categ.id
24
+ """
25
+
26
+ def _commission_items_where(self):
27
+ return """ (item.product_tmpl_id IS NULL OR item.product_tmpl_id = any(%(prod_tmpls)s))
28
+ AND (item.product_id IS NULL OR item.product_id = any(%(prod_prods)s))
29
+ AND (item.categ_id IS NULL OR item.categ_id = any(%(categs)s))
30
+ AND (item.commission_id = %(commission)s)
31
+ AND (item.active = TRUE)
32
+ """
33
+
34
+ def _commission_items_order(self):
35
+ return """item.applied_on,
36
+ item.based_on,
37
+ categ.complete_name desc
38
+ """
39
+
40
+ def _commission_items_query(self):
41
+ return f"""
42
+ SELECT item.id
43
+ FROM {self._commission_items_from()}
44
+ WHERE {self._commission_items_where()}
45
+ ORDER BY {self._commission_items_order()}
46
+ """
47
+
48
+ def _commission_items_query_params(self, commission, product):
23
49
  categ_ids = {}
24
50
  categ = product.categ_id
25
51
  while categ:
26
52
  categ_ids[categ.id] = True
27
53
  categ = categ.parent_id
28
54
  categ_ids = list(categ_ids)
29
- # Select all suitable items. Order by best match
30
- # (priority is: all/cat/subcat/product/variant).
55
+ return {
56
+ "prod_tmpls": product.product_tmpl_id.ids,
57
+ "prod_prods": product.ids,
58
+ "categs": categ_ids,
59
+ "commission": commission._origin.id,
60
+ }
61
+
62
+ def _get_commission_items(self, commission, product):
31
63
  self.env.cr.execute(
32
- """
33
- SELECT
34
- item.id
35
- FROM
36
- commission_item AS item
37
- LEFT JOIN product_category AS categ ON item.categ_id = categ.id
38
- WHERE
39
- (item.product_tmpl_id IS NULL OR item.product_tmpl_id = any(%s))
40
- AND (item.product_id IS NULL OR item.product_id = any(%s))
41
- AND (item.categ_id IS NULL OR item.categ_id = any(%s))
42
- AND (item.commission_id = %s)
43
- AND (item.active = TRUE)
44
- ORDER BY
45
- item.applied_on, item.based_on, categ.complete_name desc
46
- """,
47
- (
48
- product.product_tmpl_id.ids,
49
- product.ids,
50
- categ_ids,
51
- commission._origin.id, # Added this
52
- ),
64
+ self._commission_items_query(),
65
+ self._commission_items_query_params(commission, product),
53
66
  )
54
67
  item_ids = [x[0] for x in self.env.cr.fetchall()]
55
68
  return item_ids
odoo/addons/sale_commission_product_criteria/static/description/index.html CHANGED
@@ -367,7 +367,7 @@ ul.auto-toc {
367
367
  !! This file is generated by oca-gen-addon-readme !!
368
368
  !! changes will be overwritten. !!
369
369
  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370
- !! source digest: sha256:42e4737070e1268a622af8ffacf3e25bacd99ec5696dbfd5c10f92ea0ab09a4d
370
+ !! source digest: sha256:4bd16205ce53357916f35f63494314b7c39a51d4b787e42f7e13b0eb69fc90f0
371
371
  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372
372
  <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>
373
373
  <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.dist-info → odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: odoo-addon-sale_commission_product_criteria
3
- Version: 16.0.1.0.1
3
+ Version: 16.0.2.0.0
4
4
  Summary: Advanced commissions rules
5
5
  Home-page: https://github.com/OCA/commission
6
6
  Author: Ilyas, Ooops404, Odoo Community Association (OCA)
@@ -23,7 +23,7 @@ Sale Commission Product Criteria
23
23
  !! This file is generated by oca-gen-addon-readme !!
24
24
  !! changes will be overwritten. !!
25
25
  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
26
- !! source digest: sha256:42e4737070e1268a622af8ffacf3e25bacd99ec5696dbfd5c10f92ea0ab09a4d
26
+ !! source digest: sha256:4bd16205ce53357916f35f63494314b7c39a51d4b787e42f7e13b0eb69fc90f0
27
27
  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
28
28
 
29
29
  .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
{odoo_addon_sale_commission_product_criteria-16.0.1.0.1.dist-info → odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info}/RECORD RENAMED
@@ -1,26 +1,26 @@
1
- odoo/addons/sale_commission_product_criteria/README.rst,sha256=rwYdzODj-F2BWZ4dx0wLzRmomD8J7AuWftQ06hlzrPw,4673
1
+ odoo/addons/sale_commission_product_criteria/README.rst,sha256=tA4mAvMbDH3Id_ZbaWkDx0rwyuZ73KJ3-BXgdsDIKAE,4673
2
2
  odoo/addons/sale_commission_product_criteria/__init__.py,sha256=X9EJGOE2GtZbS0G82PtSXmWSZ_R8jEM0rlJTDliQjp4,21
3
- odoo/addons/sale_commission_product_criteria/__manifest__.py,sha256=Wez7mCTV4_dwgBeGFAjtYcGaAAb0HoWEEtZFIk3PL_8,718
3
+ odoo/addons/sale_commission_product_criteria/__manifest__.py,sha256=svvmIsp965MeU_Z1GD5k5bQb53m93ZfiS2X5oA6_kmc,718
4
4
  odoo/addons/sale_commission_product_criteria/demo/sale_agent_demo.xml,sha256=8Mij5a1TTFyyIZK0LEoenWh-W4ucTNtwqDAF87EbT34,2665
5
5
  odoo/addons/sale_commission_product_criteria/i18n/es.po,sha256=T_MurzPti038XcMfv8rpLdaAL5Xpl7Nh1i-l-GjP0Q0,18388
6
- odoo/addons/sale_commission_product_criteria/i18n/it.po,sha256=e5Md5uoZoIR_GhY5RkNxTtsIkhylxYM7vcZmOZRBUps,19641
6
+ odoo/addons/sale_commission_product_criteria/i18n/it.po,sha256=I50Swt_ubusszXWs1wZNjQL5stC2kXT5q0OcnJ8h-88,19641
7
7
  odoo/addons/sale_commission_product_criteria/i18n/sale_commission_product_criteria.pot,sha256=G2IoUjZvuMhQsc_UGFK2gXMnUueGhvekJpz_e-W9r8A,15871
8
8
  odoo/addons/sale_commission_product_criteria/models/__init__.py,sha256=lkOi79dgLqCz-aoOq2zO8Ivf3vThIh453bGJBkUre-E,137
9
9
  odoo/addons/sale_commission_product_criteria/models/account_move.py,sha256=Q1cYIDJCmro0SrVUjP2JeQeeTxkOmN6U_99t6D3B-a4,1027
10
10
  odoo/addons/sale_commission_product_criteria/models/commission.py,sha256=PmKeTU_Hh7XPZ5XNyhYTpm-sLaV0sMIMHtyWqkFUDyc,9771
11
11
  odoo/addons/sale_commission_product_criteria/models/sale.py,sha256=cMxxuZWVmldPoUqKDgU-_BFMC8X292x9l1b6badrhEA,1991
12
- odoo/addons/sale_commission_product_criteria/models/sale_commission_line_mixin.py,sha256=pbGdRGuKk9l4JE8isznZSkhDtHoGzNyp6C_NTX7dQwM,3065
12
+ odoo/addons/sale_commission_product_criteria/models/sale_commission_line_mixin.py,sha256=Gyu8-uTsNXtUNpKngAihM64IblU7AYAWafKFLGUAl6c,3463
13
13
  odoo/addons/sale_commission_product_criteria/models/settlement.py,sha256=c9rhprm8Vz4HHYJ2-5tgs2Gi1UzNmjtAlmEWVw7BuN8,191
14
14
  odoo/addons/sale_commission_product_criteria/readme/CONTRIBUTORS.rst,sha256=QY6T07gmiPvozyM8CAFJN6IQBD0SFtwghoDU5fLIIjA,168
15
15
  odoo/addons/sale_commission_product_criteria/readme/DESCRIPTION.rst,sha256=7ZEUYQ-wLmMBfizeqrWf09YeCiA7TSdcb-nocTRsUrk,1038
16
16
  odoo/addons/sale_commission_product_criteria/readme/USAGE.rst,sha256=opr0MY68l3yNs3rj31HxdAVcFT2wAUpDIntiu5mXuMo,366
17
17
  odoo/addons/sale_commission_product_criteria/security/ir.model.access.csv,sha256=l4p29Bw20_pdCUkFc0ApE6mAEohTQOPo5VwmuyYMnZY,324
18
18
  odoo/addons/sale_commission_product_criteria/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
19
- odoo/addons/sale_commission_product_criteria/static/description/index.html,sha256=jmsX3jB5sCTSKrWrcgn1IbDTAtP41-LqaLvsRZlMnCM,14503
19
+ odoo/addons/sale_commission_product_criteria/static/description/index.html,sha256=qzkWEuRo0LnffgZymGoGm73J5z6OLR6d59vVibgiIHI,14503
20
20
  odoo/addons/sale_commission_product_criteria/tests/__init__.py,sha256=gR27hVtH8fvlbCsPJq4JRfSYMXQlBQkjhULr_rcLki0,52
21
21
  odoo/addons/sale_commission_product_criteria/tests/test_sale_commission_product_criteria.py,sha256=6SP_rJ7LN486WO_gtRTxdLJotCiFko29J9IKd5gqTCg,8979
22
22
  odoo/addons/sale_commission_product_criteria/views/views.xml,sha256=Q2wwfQxtZ3cUMXkAoyrBGpmGDqSFi295pWnSoYBL0bs,10449
23
- odoo_addon_sale_commission_product_criteria-16.0.1.0.1.dist-info/METADATA,sha256=uDTTPZnCiWaJv2oTUA0g8gH5FhtEQLeHwGIO9AZ2V7w,5269
24
- odoo_addon_sale_commission_product_criteria-16.0.1.0.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
25
- odoo_addon_sale_commission_product_criteria-16.0.1.0.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
26
- odoo_addon_sale_commission_product_criteria-16.0.1.0.1.dist-info/RECORD,,
23
+ odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info/METADATA,sha256=HtRIvoDRQIN69kVagWVcqfCg1hx0pQ4cleIQCekYwq4,5269
24
+ odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
25
+ odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
26
+ odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info/RECORD,,
{odoo_addon_sale_commission_product_criteria-16.0.1.0.1.dist-info → odoo_addon_sale_commission_product_criteria-16.0.2.0.0.dist-info}/WHEEL RENAMED
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: bdist_wheel (0.44.0)
2
+ Generator: bdist_wheel (0.45.1)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5