Merge pull request #493 from OCA/15.0

Syncing from upstream OCA/commission (15.0)
brain-tec · Oct 31, 2024 · 1dcf701 · 1dcf701
2 parents 001b6fd + 2ef3624
commit 1dcf701
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -21,8 +21,8 @@ Available addons
 ----------------
 addon | version | maintainers | summary
 --- | --- | --- | ---
-[account_commission](account_commission/) | 15.0.3.3.2 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Account commissions
-[commission](commission/) | 15.0.3.2.1 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Commissions
+[account_commission](account_commission/) | 15.0.3.4.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Account commissions
+[commission](commission/) | 15.0.3.3.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Commissions
 [commission_formula](commission_formula/) | 15.0.1.0.0 |  | Commissions computed by formulas
 [hr_commission](hr_commission/) | 15.0.1.0.1 |  | HR commissions
 [sale_commission](sale_commission/) | 15.0.2.1.1 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Sales commissions

diff --git a/account_commission/README.rst b/account_commission/README.rst
@@ -7,7 +7,7 @@ Account commissions
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:0e0fd65289aeddebd4759567566b4e2b2221c76b50dedc95e7da15c899e13fec
+   !! source digest: sha256:4f71d7600026f944a17d73e06578158fa1fa759b787742023900e67016a63dff
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/account_commission/__manifest__.py b/account_commission/__manifest__.py
@@ -3,7 +3,7 @@
 # Copyright 2014-2022 Tecnativa - Pedro M. Baeza
 {
     "name": "Account commissions",
-    "version": "15.0.3.3.2",
+    "version": "15.0.3.4.0",
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "category": "Sales Management",
     "license": "AGPL-3",

diff --git a/account_commission/static/description/index.html b/account_commission/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Account commissions</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:0e0fd65289aeddebd4759567566b4e2b2221c76b50dedc95e7da15c899e13fec
+!! source digest: sha256:4f71d7600026f944a17d73e06578158fa1fa759b787742023900e67016a63dff
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/15.0/account_commission"><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-15-0/commission-15-0-account_commission"><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=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module adds the function to calculate commissions in invoices (account moves).</p>

diff --git a/account_commission/views/report_settlement_templates.xml b/account_commission/views/report_settlement_templates.xml
@@ -38,11 +38,5 @@
                 </td>
             </t>
         </xpath>
-        <xpath expr="//table/tfoot/tr/td" position="before">
-            <t t-if="o.settlement_type == 'sale_invoice'">
-                <td />
-                <td />
-            </t>
-        </xpath>
     </template>
 </odoo>
diff --git a/commission/README.rst b/commission/README.rst
@@ -7,7 +7,7 @@ Commissions
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:6fad540f527f5734bbfba5d3387edda421579082dcbf3ad44d1fee7e14cf59e2
+   !! source digest: sha256:c28efe8b5c676d4b17dfde282c0e70a619ea0127f94877e9a32eef7150a7debc
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/commission/__manifest__.py b/commission/__manifest__.py
@@ -3,7 +3,7 @@
 # Copyright 2014-2022 Tecnativa - Pedro M. Baeza
 {
     "name": "Commissions",
-    "version": "15.0.3.2.1",
+    "version": "15.0.3.3.0",
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "category": "Invoicing",
     "license": "AGPL-3",

diff --git a/commission/i18n/commission.pot b/commission/i18n/commission.pot
@@ -44,14 +44,19 @@ msgstr ""
 msgid "<strong>From:</strong>"
 msgstr ""
 
+#. module: commission
+#: model_terms:ir.ui.view,arch_db:commission.report_settlement_document
+msgid "<strong>Global commission amount:</strong>"
+msgstr ""
+
 #. module: commission
 #: model_terms:ir.ui.view,arch_db:commission.report_settlement_document
 msgid "<strong>To:</strong>"
 msgstr ""
 
 #. module: commission
 #: model_terms:ir.ui.view,arch_db:commission.report_settlement_document
-msgid "<strong>Total</strong>"
+msgid "<strong>Total</strong> ("
 msgstr ""
 
 #. module: commission

diff --git a/commission/reports/report_settlement_templates.xml b/commission/reports/report_settlement_templates.xml
@@ -17,6 +17,15 @@
             <div class="mt-5">
                 <div class="page">
                     <h2>Settlement</h2>
+                    <t t-if="show_doc_total">
+                        <div class="text-right">
+                            <strong>Global commission amount:</strong>
+                            <span
+                                t-esc="sum(docs.mapped('total'))"
+                                t-options="{'widget': 'monetary', 'display_currency': docs[0].currency_id}"
+                            />
+                        </div>
+                    </t>
                     <div id="informations" class="row mt-4 mb-4">
                         <div class="col-auto col-3 mw-100 mb-2" t-if="o.date_from">
                             <strong>From:</strong>
@@ -51,28 +60,38 @@
                                 </td>
                             </tr>
                         </tbody>
-                        <tfoot>
-                            <tr>
-                                <td />
-                                <td class="text-end">
-                                    <strong>Total</strong>
-                                </td>
-                                <td class="text-end">
-                                    <span
-                                        t-field="o.total"
-                                        t-options="{'widget': 'monetary', 'display_currency': o.currency_id}"
-                                    />
-                                </td>
-                            </tr>
-                        </tfoot>
                     </table>
+                    <div class="clearfix" name="commission_total_summary">
+                        <div id="total" class="row" name="total">
+                            <div class="col-6 ml-auto">
+                                <table class="table table-sm">
+                                    <tr class="border-black o_total">
+                                        <td name="td_amount_total_label"><strong
+                                            >Total</strong> (<span
+                                                t-field="o.date_from"
+                                            /> - <span t-field="o.date_to" />)</td>
+                                        <td class="text-right">
+                                            <span
+                                                t-field="o.total"
+                                                t-options="{'widget': 'monetary', 'display_currency': o.currency_id}"
+                                            />
+                                        </td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </t>
     </template>
 
     <template id="report_settlement">
         <t t-call="web.html_container">
+            <t
+                t-set="show_doc_total"
+                t-value="len(docs) > 1 and len(docs.mapped('currency_id')) == 1"
+            />
             <t t-foreach="docs" t-as="o">
                 <t
                     t-call="commission.report_settlement_document"

diff --git a/commission/static/description/index.html b/commission/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Commissions</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:6fad540f527f5734bbfba5d3387edda421579082dcbf3ad44d1fee7e14cf59e2
+!! source digest: sha256:c28efe8b5c676d4b17dfde282c0e70a619ea0127f94877e9a32eef7150a7debc
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/15.0/commission"><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-15-0/commission-15-0-commission"><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=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module provides the base functions for commission operations to enable the