Merge PR #569 into 14.0

Signed-off-by ilyasProgrammer

sale_commission_product_criteria/README.rst

@@ -103,10 +103,19 @@ promote its widespread use.
 .. |maintainer-ilyasProgrammer| image:: https://github.com/ilyasProgrammer.png?size=40px
     :target: https://github.com/ilyasProgrammer
     :alt: ilyasProgrammer
-
-Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
-
-|maintainer-ilyasProgrammer| 
+.. |maintainer-aleuffre| image:: https://github.com/aleuffre.png?size=40px
+    :target: https://github.com/aleuffre
+    :alt: aleuffre
+.. |maintainer-renda-dev| image:: https://github.com/renda-dev.png?size=40px
+    :target: https://github.com/renda-dev
+    :alt: renda-dev
+.. |maintainer-PicchiSeba| image:: https://github.com/PicchiSeba.png?size=40px
+    :target: https://github.com/PicchiSeba
+    :alt: PicchiSeba
+
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-ilyasProgrammer| |maintainer-aleuffre| |maintainer-renda-dev| |maintainer-PicchiSeba| 
 
 This module is part of the `OCA/commission <https://github.com/OCA/commission/tree/14.0/sale_commission_product_criteria>`_ project on GitHub.
 

sale_commission_product_criteria/__manifest__.py

@@ -5,12 +5,13 @@
     "summary": "Advanced commissions rules",
     "version": "14.0.1.1.5",
     "author": "Ilyas, Ooops404, Odoo Community Association (OCA)",
-    "maintainers": ["ilyasProgrammer"],
+    "maintainers": ["ilyasProgrammer", "aleuffre", "renda-dev", "PicchiSeba"],
     "website": "https://github.com/OCA/commission",
     "category": "Sales Management",
     "license": "AGPL-3",
     "depends": ["sale_commission", "web_domain_field"],
     "data": [
+        "reports/report_settlement_template.xml",
         "views/views.xml",
         "security/ir.model.access.csv",
     ],

sale_commission_product_criteria/models/__init__.py

@@ -2,4 +2,3 @@
 from . import commission
 from . import sale
 from . import account_move
-from . import settlement

sale_commission_product_criteria/reports/report_settlement_template.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template id="report_settlement" inherit_id="sale_commission.report_settlement">
+        <xpath expr="//table/thead/tr/th[last()]" position="before">
+            <t
+                t-set="show_value_column"
+                t-value="any(l.agent_line.applied_commission_item_id for l in o.line_ids)"
+            />
+            <t t-if="show_value_column">
+                <th>Value</th>
+            </t>
+        </xpath>
+        <xpath expr="//table/tbody/tr/td[last()]" position="before">
+            <t t-if="show_value_column">
+                <td>
+                    <t
+                        t-set="comm_item"
+                        t-value="l.agent_line.applied_commission_item_id"
+                    />
+                    <t t-if="comm_item.commission_type == 'fixed'">
+                        <span
+                            t-field="comm_item.fixed_amount"
+                            t-options="{'widget': 'monetary', 'display_currency': o.currency_id}"
+                        />
+                    </t>
+                    <t t-elif="comm_item.commission_type == 'percentage'">
+                        <span t-field="comm_item.percent_amount" />%
+                    </t>
+                </td>
+            </t>
+        </xpath>
+    </template>
+</odoo>

sale_commission_product_criteria/static/description/index.html

@@ -439,8 +439,8 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
-<p><a class="reference external image-reference" href="https://github.com/ilyasProgrammer"><img alt="ilyasProgrammer" src="https://github.com/ilyasProgrammer.png?size=40px" /></a></p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
+<p><a class="reference external image-reference" href="https://github.com/ilyasProgrammer"><img alt="ilyasProgrammer" src="https://github.com/ilyasProgrammer.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/aleuffre"><img alt="aleuffre" src="https://github.com/aleuffre.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/renda-dev"><img alt="renda-dev" src="https://github.com/renda-dev.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/PicchiSeba"><img alt="PicchiSeba" src="https://github.com/PicchiSeba.png?size=40px" /></a></p>
 <p>This module is part of the <a class="reference external" href="https://github.com/OCA/commission/tree/14.0/sale_commission_product_criteria">OCA/commission</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>