Merge pull request #462 from OCA/14.0

Syncing from upstream OCA/commission (14.0)
brain-tec · Jun 27, 2024 · 67f024b · 67f024b
2 parents 761edf2 + 9c6a00f
commit 67f024b
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -31,9 +31,9 @@ addon | version | maintainers | summary
 [sale_commission_geo_assign_product_domain](sale_commission_geo_assign_product_domain/) | 14.0.1.3.0 | [![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.0 |  | 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.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.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_domain](sale_commission_product_criteria_domain/) | 14.0.1.0.8 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | Sale Commission Product Criteria Domain
+[sale_commission_product_criteria_domain](sale_commission_product_criteria_domain/) | 14.0.1.0.9 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | 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
 [sale_quick_commission](sale_quick_commission/) | 14.0.1.0.0 |  | Makes modules compatible

diff --git 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:7a8e7902a0d38273ca1dd6303b616c8173df8b089f3024a614b5b3b83a3319c2
+   !! source digest: sha256:85fe902e66b93499066c57dc66a2b4a159219acd3db4413d884eb5be1ac7b6b5
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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
@@ -3,7 +3,7 @@
 {
     "name": "Sale Commission Product Criteria",
     "summary": "Advanced commissions rules",
-    "version": "14.0.1.1.3",
+    "version": "14.0.1.1.4",
     "author": "Ilyas, Ooops404, Odoo Community Association (OCA)",
     "maintainers": ["ilyasProgrammer"],
     "website": "https://github.com/OCA/commission",

diff --git a/sale_commission_product_criteria/models/account_move.py b/sale_commission_product_criteria/models/account_move.py
@@ -17,11 +17,15 @@ def _compute_amount(self):
         for line in self:
             if line.commission_id and line.commission_id.commission_type == "product":
                 inv_line = line.object_id
-                line.amount = line._get_single_commission_amount(
+                amount = line._get_single_commission_amount(
                     line.commission_id,
                     inv_line.price_subtotal,
                     inv_line.product_id,
                     inv_line.quantity,
                 )
+                if line.invoice_id.move_type == "out_refund":
+                    line.amount = -amount
+                else:
+                    line.amount = amount
             else:
                 super(AccountInvoiceLineAgent, line)._compute_amount()
diff --git a/sale_commission_product_criteria/static/description/index.html b/sale_commission_product_criteria/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -367,7 +366,7 @@ <h1 class="title">Sale Commission Product Criteria</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:7a8e7902a0d38273ca1dd6303b616c8173df8b089f3024a614b5b3b83a3319c2
+!! source digest: sha256:85fe902e66b93499066c57dc66a2b4a159219acd3db4413d884eb5be1ac7b6b5
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/14.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-14-0/commission-14-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=14.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>

diff --git a/sale_commission_product_criteria_domain/README.rst b/sale_commission_product_criteria_domain/README.rst
@@ -7,7 +7,7 @@ Sale Commission Product Criteria Domain
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:36a53ef60d48688580c2a8634e20ce42dd4b6c8964706f975231881673034412
+   !! source digest: sha256:0b910948888eff412e320ba5a0ec1b00da2f4e88b6a41e2615e73f0a581cf640
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/sale_commission_product_criteria_domain/__manifest__.py b/sale_commission_product_criteria_domain/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html
 {
     "name": "Sale Commission Product Criteria Domain",
-    "version": "14.0.1.0.8",
+    "version": "14.0.1.0.9",
     "author": "Ilyas," "Ooops404," "Odoo Community Association (OCA)",
     "contributors": ["Ilyas"],
     "maintainers": ["ilyasProgrammer"],

diff --git a/sale_commission_product_criteria_domain/models/account_invoice_line_agent.py b/sale_commission_product_criteria_domain/models/account_invoice_line_agent.py
@@ -18,11 +18,15 @@ def _compute_amount(self):
                 and line.commission_id.commission_type == "product_restricted"
             ):
                 inv_line = line.object_id
-                line.amount = line._get_single_commission_amount(
+                amount = line._get_single_commission_amount(
                     line.commission_id,
                     inv_line.price_subtotal,
                     inv_line.product_id,
                     inv_line.quantity,
                 )
+                if line.invoice_id.move_type == "out_refund":
+                    line.amount = -amount
+                else:
+                    line.amount = amount
             else:
                 super(AccountInvoiceLineAgent, line)._compute_amount()
diff --git a/sale_commission_product_criteria_domain/static/description/index.html b/sale_commission_product_criteria_domain/static/description/index.html
@@ -366,7 +366,7 @@ <h1 class="title">Sale Commission Product Criteria Domain</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:36a53ef60d48688580c2a8634e20ce42dd4b6c8964706f975231881673034412
+!! source digest: sha256:0b910948888eff412e320ba5a0ec1b00da2f4e88b6a41e2615e73f0a581cf640
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/14.0/sale_commission_product_criteria_domain"><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-14-0/commission-14-0-sale_commission_product_criteria_domain"><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=14.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 limit applied commission items for specific groups.</p>