Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Syncing from upstream OCA/commission (15.0) #493

Merged
merged 4 commits into from
Oct 31, 2024
Merged

Syncing from upstream OCA/commission (15.0) #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41fa94e
[IMP] sale_commission: print partial and document total in report
aleuffre Oct 23, 2024
3a9d6a6
Merge PR #572 into 15.0
OCA-git-bot Oct 29, 2024
25bbd16
[UPD] Update commission.pot
Oct 29, 2024
2ef3624
[BOT] post-merge updates
OCA-git-bot Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion account_commission/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion account_commission/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion account_commission/static/description/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 0 additions & 6 deletions account_commission/views/report_settlement_templates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion commission/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion commission/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 6 additions & 1 deletion commission/i18n/commission.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
47 changes: 33 additions & 14 deletions commission/reports/report_settlement_templates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion commission/static/description/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading