odoo-addon-account-commission 16.0.2.4.2.1__py3-none-any.whl → 16.0.2.5.0.1__py3-none-any.whl

odoo/addons/account_commission/README.rst

@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 ===================
 Account commissions
 ===================
@@ -7,13 +11,13 @@ Account commissions
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:50991bf7ef618b918f0d0086baa3b337a6752514967915425fbbac2f07557231
+   !! source digest: sha256:c59d19febb630cbe46de5e379d652d5eb3237844ebc57ee4542555c81045a75e
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github

odoo/addons/account_commission/__manifest__.py

@@ -3,7 +3,7 @@
 # Copyright 2014-2022 Tecnativa - Pedro M. Baeza
 {
     "name": "Account commissions",
-    "version": "16.0.2.4.2",
+    "version": "16.0.2.5.0",
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "category": "Sales Management",
     "license": "AGPL-3",
@@ -23,6 +23,7 @@
         "views/report_settlement_templates.xml",
         "report/commission_analysis_view.xml",
         "wizards/wizard_invoice.xml",
+        "wizards/commission_make_settle_views.xml",
     ],
     "installable": True,
 }

odoo/addons/account_commission/i18n/account_commission.pot

@@ -210,6 +210,13 @@ msgstr ""
 msgid "Extended Filters"
 msgstr ""
 
+#. module: account_commission
+#: model:ir.model.fields,help:account_commission.field_commission_make_settle__date_payment_to
+msgid ""
+"For payment-based commissions, settlements will be created for payments"
+"             with date up to the one set in this field."
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_commission_make_invoice__from_settlement
 msgid "From Settlement"
@@ -390,6 +397,11 @@ msgstr ""
 msgid "Payment Based"
 msgstr ""
 
+#. module: account_commission
+#: model:ir.model.fields,field_description:account_commission.field_commission_make_settle__date_payment_to
+msgid "Payment date up to"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__percentage
 msgid "Percentage of commission"

odoo/addons/account_commission/i18n/es.po

@@ -213,6 +213,13 @@ msgstr "Editar agentes"
 msgid "Extended Filters"
 msgstr "Filtros extendidos"
 
+#. module: account_commission
+#: model:ir.model.fields,help:account_commission.field_commission_make_settle__date_payment_to
+msgid ""
+"For payment-based commissions, settlements will be created for "
+"payments             with date up to the one set in this field."
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_commission_make_invoice__from_settlement
 msgid "From Settlement"
@@ -393,6 +400,11 @@ msgstr "Socio"
 msgid "Payment Based"
 msgstr "Basado en Pagos"
 
+#. module: account_commission
+#: model:ir.model.fields,field_description:account_commission.field_commission_make_settle__date_payment_to
+msgid "Payment date up to"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__percentage
 msgid "Percentage of commission"
@@ -446,8 +458,8 @@ msgid ""
 "refunded)."
 msgstr ""
 "Seleccione el estado de la factura para liquidar las comisiones:\n"
-"* 'Basado en factura': Las comisiones se liquidan cuando se emite la factura."
-"\n"
+"* 'Basado en factura': Las comisiones se liquidan cuando se emite la "
+"factura.\n"
 "* 'Basado en Pago': Las comisiones se liquidan cuando se paga (o reembolsa) "
 "la factura."
 

odoo/addons/account_commission/i18n/fr.po

@@ -214,6 +214,13 @@ msgstr "Modifier agents"
 msgid "Extended Filters"
 msgstr "Filtres avancés"
 
+#. module: account_commission
+#: model:ir.model.fields,help:account_commission.field_commission_make_settle__date_payment_to
+msgid ""
+"For payment-based commissions, settlements will be created for "
+"payments             with date up to the one set in this field."
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_commission_make_invoice__from_settlement
 msgid "From Settlement"
@@ -394,6 +401,11 @@ msgstr "Partenaire"
 msgid "Payment Based"
 msgstr "Basé sur payement"
 
+#. module: account_commission
+#: model:ir.model.fields,field_description:account_commission.field_commission_make_settle__date_payment_to
+msgid "Payment date up to"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__percentage
 msgid "Percentage of commission"
@@ -443,7 +455,8 @@ msgstr "Factures de vente"
 msgid ""
 "Select the invoice status for settling the commissions:\n"
 "* 'Invoice Based': Commissions are settled when the invoice is issued.\n"
-"* 'Payment Based': Commissions are settled when the invoice is paid (or refunded)."
+"* 'Payment Based': Commissions are settled when the invoice is paid (or "
+"refunded)."
 msgstr ""
 "Selectionner le statut de la facture pour le règlement des commissions :\n"
 "*'Basé sur facture' : Les commissions sont réglées à l'émission de la "
@@ -521,8 +534,8 @@ msgstr "Sous-total"
 #. module: account_commission
 #: model:ir.model.fields,help:account_commission.field_commission_settlement__settlement_type
 msgid ""
-"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase"
-" order'..."
+"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase "
+"order'..."
 msgstr ""
 "La source du règlement, ex. 'Facture de vente', 'Bon de commande de vente', "
 "'Bon de commande d'achat' ..."

odoo/addons/account_commission/i18n/hr.po

@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__quantity
@@ -212,6 +212,13 @@ msgstr ""
 msgid "Extended Filters"
 msgstr ""
 
+#. module: account_commission
+#: model:ir.model.fields,help:account_commission.field_commission_make_settle__date_payment_to
+msgid ""
+"For payment-based commissions, settlements will be created for "
+"payments             with date up to the one set in this field."
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_commission_make_invoice__from_settlement
 msgid "From Settlement"
@@ -392,6 +399,11 @@ msgstr ""
 msgid "Payment Based"
 msgstr ""
 
+#. module: account_commission
+#: model:ir.model.fields,field_description:account_commission.field_commission_make_settle__date_payment_to
+msgid "Payment date up to"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__percentage
 msgid "Percentage of commission"

odoo/addons/account_commission/i18n/it.po

@@ -213,6 +213,13 @@ msgstr "Modifica agenti"
 msgid "Extended Filters"
 msgstr "Filtri estesi"
 
+#. module: account_commission
+#: model:ir.model.fields,help:account_commission.field_commission_make_settle__date_payment_to
+msgid ""
+"For payment-based commissions, settlements will be created for "
+"payments             with date up to the one set in this field."
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_commission_make_invoice__from_settlement
 msgid "From Settlement"
@@ -393,6 +400,11 @@ msgstr "Partner"
 msgid "Payment Based"
 msgstr "Basato su pagamenti"
 
+#. module: account_commission
+#: model:ir.model.fields,field_description:account_commission.field_commission_make_settle__date_payment_to
+msgid "Payment date up to"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__percentage
 msgid "Percentage of commission"

odoo/addons/account_commission/i18n/ja.po

@@ -213,6 +213,13 @@ msgstr ""
 msgid "Extended Filters"
 msgstr "拡張フィルタ"
 
+#. module: account_commission
+#: model:ir.model.fields,help:account_commission.field_commission_make_settle__date_payment_to
+msgid ""
+"For payment-based commissions, settlements will be created for "
+"payments             with date up to the one set in this field."
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_commission_make_invoice__from_settlement
 msgid "From Settlement"
@@ -393,6 +400,11 @@ msgstr "取引先"
 msgid "Payment Based"
 msgstr "支払基準"
 
+#. module: account_commission
+#: model:ir.model.fields,field_description:account_commission.field_commission_make_settle__date_payment_to
+msgid "Payment date up to"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__percentage
 msgid "Percentage of commission"

odoo/addons/account_commission/i18n/pt.po

@@ -213,6 +213,13 @@ msgstr "Editar agentes"
 msgid "Extended Filters"
 msgstr "Filtros Extendidos"
 
+#. module: account_commission
+#: model:ir.model.fields,help:account_commission.field_commission_make_settle__date_payment_to
+msgid ""
+"For payment-based commissions, settlements will be created for "
+"payments             with date up to the one set in this field."
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_commission_make_invoice__from_settlement
 msgid "From Settlement"
@@ -393,6 +400,11 @@ msgstr "Parceiro"
 msgid "Payment Based"
 msgstr "Com base no Pagamento"
 
+#. module: account_commission
+#: model:ir.model.fields,field_description:account_commission.field_commission_make_settle__date_payment_to
+msgid "Payment date up to"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__percentage
 msgid "Percentage of commission"

odoo/addons/account_commission/i18n/pt_BR.po

@@ -214,6 +214,13 @@ msgstr "Editar Representantes"
 msgid "Extended Filters"
 msgstr "Filtros Extendidos"
 
+#. module: account_commission
+#: model:ir.model.fields,help:account_commission.field_commission_make_settle__date_payment_to
+msgid ""
+"For payment-based commissions, settlements will be created for "
+"payments             with date up to the one set in this field."
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_commission_make_invoice__from_settlement
 msgid "From Settlement"
@@ -394,6 +401,11 @@ msgstr "Parceiro"
 msgid "Payment Based"
 msgstr "Pagamento Relacionado"
 
+#. module: account_commission
+#: model:ir.model.fields,field_description:account_commission.field_commission_make_settle__date_payment_to
+msgid "Payment date up to"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__percentage
 msgid "Percentage of commission"

odoo/addons/account_commission/i18n/tr.po

@@ -213,6 +213,13 @@ msgstr "Temsilcileri düzenle"
 msgid "Extended Filters"
 msgstr "Genişletilmiş Filtreler"
 
+#. module: account_commission
+#: model:ir.model.fields,help:account_commission.field_commission_make_settle__date_payment_to
+msgid ""
+"For payment-based commissions, settlements will be created for "
+"payments             with date up to the one set in this field."
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_commission_make_invoice__from_settlement
 msgid "From Settlement"
@@ -393,6 +400,11 @@ msgstr "İş Ortağı"
 msgid "Payment Based"
 msgstr "Ödeme Bazlı"
 
+#. module: account_commission
+#: model:ir.model.fields,field_description:account_commission.field_commission_make_settle__date_payment_to
+msgid "Payment date up to"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__percentage
 msgid "Percentage of commission"
@@ -442,7 +454,8 @@ msgstr "Satış Faturaları"
 msgid ""
 "Select the invoice status for settling the commissions:\n"
 "* 'Invoice Based': Commissions are settled when the invoice is issued.\n"
-"* 'Payment Based': Commissions are settled when the invoice is paid (or refunded)."
+"* 'Payment Based': Commissions are settled when the invoice is paid (or "
+"refunded)."
 msgstr ""
 "Komisyonların ödenmesi için fatura durumunu seçin:\n"
 "* 'Fatura Bazlı': Fatura düzenlendiğinde komisyonlar ödenir.\n"
@@ -518,8 +531,8 @@ msgstr "Aratoplam"
 #. module: account_commission
 #: model:ir.model.fields,help:account_commission.field_commission_settlement__settlement_type
 msgid ""
-"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase"
-" order'..."
+"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase "
+"order'..."
 msgstr ""
 "Anlaşmanın kaynağı, ör. 'Satış faturası', 'Satış siparişi', 'Alış "
 "siparişi'..."

odoo/addons/account_commission/models/account_move.py

@@ -251,7 +251,28 @@ class AccountInvoiceLineAgent(models.Model):
         :return: bool
         """
         self.ensure_one()
+        payment_based_commission = self.commission_id.invoice_state == "paid"
+        if payment_based_commission and self._skip_future_payments():
+            return True
         return (
-            self.commission_id.invoice_state == "paid"
+            payment_based_commission
             and self.invoice_id.payment_state not in ["in_payment", "paid", "reversed"]
         ) or self.invoice_id.state != "posted"
+
+    def _skip_future_payments(self):
+        date_payment_to = self.env.context.get("date_payment_to")
+        if date_payment_to:
+            payments_dates = []
+            (
+                invoice_partials,
+                exchange_diff_moves,
+            ) = self.invoice_id._get_reconciled_invoices_partials()
+            for (
+                _partial,
+                _amount,
+                counterpart_line,
+            ) in invoice_partials:
+                payments_dates.append(counterpart_line.date)
+            if any(date_payment_to < date for date in payments_dates):
+                return True
+        return False

odoo/addons/account_commission/static/description/index.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Account commissions</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,21 @@ ul.auto-toc {
 </style>
 </head>
 <body>
-<div class="document" id="account-commissions">
-<h1 class="title">Account commissions</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="account-commissions">
+<h1>Account commissions</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:50991bf7ef618b918f0d0086baa3b337a6752514967915425fbbac2f07557231
+!! source digest: sha256:c59d19febb630cbe46de5e379d652d5eb3237844ebc57ee4542555c81045a75e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/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-16-0/commission-16-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=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/commission/tree/16.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-16-0/commission-16-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=16.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>
 <p>It also allows to create vendor bills from settlements for external agents.</p>
 <p>This module depends on the commission module.</p>
@@ -388,7 +393,7 @@ ul.auto-toc {
 </ul>
 </div>
 <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
 <p>For selecting invoice status in commissions:</p>
 <ol class="arabic simple">
 <li>Edit or create a new record to select the invoice status for settling the commissions.<ul>
@@ -401,7 +406,7 @@ be settled as well, resulting in a 0 net commission between both operations.</li
 </ol>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Usage</a></h2>
 <p>For adding commissions on invoices:</p>
 <ol class="arabic simple">
 <li>Go to <em>Invoicing &gt; Customers &gt; Invoices</em>.</li>
@@ -443,7 +448,7 @@ button.</li>
 </ol>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/commission/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -451,15 +456,15 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-4">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Authors</a></h3>
 <ul class="simple">
 <li>Tecnativa</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
 <ul class="simple">
 <li>Pexego.</li>
 <li>Davide Corio &lt;<a class="reference external" href="mailto:davide.corio&#64;domsense.com">davide.corio&#64;domsense.com</a>&gt;</li>
@@ -489,7 +494,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -504,5 +509,6 @@ promote its widespread use.</p>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>

odoo/addons/account_commission/tests/test_account_commission.py

@@ -3,6 +3,8 @@
 # Copyright 2016-2022 Tecnativa - Pedro M. Baeza
 # License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html
 
+from datetime import datetime
+
 from dateutil.relativedelta import relativedelta
 
 from odoo import fields
@@ -86,9 +88,12 @@ class TestAccountCommission(TestCommissionBase):
             vals.update({"currency_id": currency.id})
         return self.env["account.move"].create([vals])
 
-    def _settle_agent_invoice(self, agent=None, period=None, date=None):
+    def _settle_agent_invoice(
+        self, agent=None, period=None, date=None, date_payment_to=None
+    ):
         vals = self._get_make_settle_vals(agent, period, date)
         vals["settlement_type"] = "sale_invoice"
+        vals["date_payment_to"] = date_payment_to
         wizard = self.make_settle_model.create(vals)
         wizard.action_settle()
 
@@ -660,7 +665,7 @@ class TestAccountCommission(TestCommissionBase):
         self.assertEqual(3, len(settlements.line_ids))
         self.assertAlmostEqual(0.6, sum(settlements.mapped("total")), 2)
 
-    def _register_payment(self, invoice):
+    def _register_payment(self, invoice, date=None):
         payment_journal = self.env["account.journal"].search(
             [("type", "=", "cash"), ("company_id", "=", self.env.company.id)],
             limit=1,
@@ -668,7 +673,12 @@ class TestAccountCommission(TestCommissionBase):
         register_payments = (
             self.env["account.payment.register"]
             .with_context(active_ids=invoice.id, active_model="account.move")
-            .create({"journal_id": payment_journal.id})
+            .create(
+                {
+                    "journal_id": payment_journal.id,
+                    "payment_date": date or datetime.now(),
+                }
+            )
         )
         register_payments.action_create_payments()
 
@@ -694,3 +704,23 @@ class TestAccountCommission(TestCommissionBase):
         self._settle_agent_invoice(self.agent_pending, 1)
         settlements = self.settle_model.search([("state", "=", "settled")])
         self.assertEqual(len(settlements.line_ids), 3)
+
+    def test_payment_date_settlement(self):
+        date = fields.Date.today()
+
+        invoice_after_cutoff = self._create_invoice(
+            self.agent_monthly, self.commission_net_paid
+        )
+        invoice_after_cutoff.invoice_line_ids.agent_ids._compute_amount()
+        invoice = self._create_invoice(self.agent_monthly, self.commission_net_paid)
+        invoice.invoice_line_ids.agent_ids._compute_amount()
+        (invoice_after_cutoff + invoice).action_post()
+
+        # Payment after the wizard payment date, not included in the settlement
+        self._register_payment(invoice_after_cutoff, date + relativedelta(days=2))
+        # Payment before the wizard payment date, not included in the settlement
+        self._register_payment(invoice, date - relativedelta(days=2))
+        self._settle_agent_invoice(self.agent_monthly, 1, date_payment_to=date)
+        settlements = self.settle_model.search([("state", "=", "settled")])
+        self.assertEqual(1, len(settlements))
+        self.assertEqual(1, len(settlements.line_ids))

odoo/addons/account_commission/wizards/commission_make_settle.py

@@ -13,6 +13,12 @@ class CommissionMakeSettle(models.TransientModel):
         selection_add=[("sale_invoice", "Sales Invoices")],
         ondelete={"sale_invoice": "cascade"},
     )
+    date_payment_to = fields.Date(
+        "Payment date up to",
+        help="For payment-based commissions, settlements will be created for payments \
+            with date up to the one set in this field.",
+        default=fields.Date.today,
+    )
 
     def _get_account_settle_domain(self, agent, date_to_agent):
         return [
@@ -46,3 +52,7 @@ class CommissionMakeSettle(models.TransientModel):
                 }
             )
         return res
+
+    def action_settle(self):
+        self = self.with_context(date_payment_to=self.date_payment_to)
+        return super().action_settle()

odoo/addons/account_commission/wizards/commission_make_settle_views.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_commission_make_settle_date_payment" model="ir.ui.view">
+        <field name="name">commission.make.settle.date.payment</field>
+        <field name="model">commission.make.settle</field>
+        <field name="inherit_id" ref="commission.view_settled_wizard" />
+        <field name="arch" type="xml">
+            <field name="date_to" position="after">
+                <field name="date_payment_to" />
+            </field>
+        </field>
+    </record>
+</odoo>

{odoo_addon_account_commission-16.0.2.4.2.1.dist-info → odoo_addon_account_commission-16.0.2.5.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account_commission
-Version: 16.0.2.4.2.1
+Version: 16.0.2.5.0.1
 Summary: Account commissions
 Home-page: https://github.com/OCA/commission
 Author: Tecnativa, Odoo Community Association (OCA)
@@ -14,6 +14,10 @@ Requires-Python: >=3.10
 Requires-Dist: odoo-addon-commission<16.1dev,>=16.0dev
 Requires-Dist: odoo<16.1dev,>=16.0a
 
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 ===================
 Account commissions
 ===================
@@ -23,13 +27,13 @@ Account commissions
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:50991bf7ef618b918f0d0086baa3b337a6752514967915425fbbac2f07557231
+   !! source digest: sha256:c59d19febb630cbe46de5e379d652d5eb3237844ebc57ee4542555c81045a75e
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github

{odoo_addon_account_commission-16.0.2.4.2.1.dist-info → odoo_addon_account_commission-16.0.2.5.0.1.dist-info}/RECORD

@@ -1,18 +1,18 @@
-odoo/addons/account_commission/README.rst,sha256=6pmSEYTQun7FeYzWZNGdJG1Nk-Z9aye1g0CKxH1cwaY,6161
+odoo/addons/account_commission/README.rst,sha256=7CRlVmg-pS0mCf4klLv3P4Js6j7I8FNeT3b1QxoYvKg,6326
 odoo/addons/account_commission/__init__.py,sha256=8JG3SPnwMlgXTppOwkp3YTgDDQGo7U7veMEMpG1bL_c,64
-odoo/addons/account_commission/__manifest__.py,sha256=06daeydoCHPZIMO2G9Nj8_F9NFWWmoJA0_Iy7d-MZS8,893
+odoo/addons/account_commission/__manifest__.py,sha256=KqPM9BBDCN7StMw2wXLQjDD__6Zx10kSbxIKlNdYmJw,945
 odoo/addons/account_commission/data/menuitem_data.xml,sha256=OX8KpilSn3zWf9cMNiJLDO7aV_vtaH6GTIyMZWDxYqM,361
-odoo/addons/account_commission/i18n/account_commission.pot,sha256=YM_lHjaDADe8EjFteiOtG5wRZutjZuvuXy8P7hCbZRU,21969
-odoo/addons/account_commission/i18n/es.po,sha256=LpIYITZRhwsIS9g0vHTFn2y9UQB42-LtKtD9ZKEWOJ8,25330
-odoo/addons/account_commission/i18n/fr.po,sha256=GjfNCbyouAIQ4InWglax2zcs3P17BALNJWmw-xbNkcA,24822
-odoo/addons/account_commission/i18n/hr.po,sha256=fotrWfKSA3Y7s8tge3UnkmwrlhM67nOOrigouGlauZA,22119
-odoo/addons/account_commission/i18n/it.po,sha256=P3sjkH9Zx7LpwhsutuAyPS3zwJXrP8EOpEumdFKfSjc,24749
-odoo/addons/account_commission/i18n/ja.po,sha256=YeK90kjfYXIq-Id4mPNrdcwt3MOLXt2iVGvVQhhXiR8,24668
-odoo/addons/account_commission/i18n/pt.po,sha256=83MR5lys6a8oRodMzS281ZWPj1bxg8Gvt6s-lRM3sek,24531
-odoo/addons/account_commission/i18n/pt_BR.po,sha256=r9XZOLIDWDr-iqm4tUoySIOGuPXXj2Ob0MVdMjjIpEs,24842
-odoo/addons/account_commission/i18n/tr.po,sha256=37k7M4oibBRneT4JTgiEEakIebFs7GFsVFlDdLhK1lk,24331
+odoo/addons/account_commission/i18n/account_commission.pot,sha256=SnF-9UtFGizmgRYJa8tPqjE5bDeigee_ESc0E83bJdw,22422
+odoo/addons/account_commission/i18n/es.po,sha256=kpHumZQByzaj0eNmQTz438eUvMBdLvy2Pmsk1-Csh4A,25783
+odoo/addons/account_commission/i18n/fr.po,sha256=SRr5-F_X8q5JFcdwAyKHJ3qELEhXQuKwTT0YdPSeTO4,25278
+odoo/addons/account_commission/i18n/hr.po,sha256=wK3zx_pQK_MdiMeMuf3pxz9ZURYjcd4U20lW9LRBy9Y,22572
+odoo/addons/account_commission/i18n/it.po,sha256=9iwse2wMtJy7kN-rVw8ptm-Ho3-9Y3GkrwLzuxeD9vA,25202
+odoo/addons/account_commission/i18n/ja.po,sha256=iUs8C4E75ekXSsV8osB-BAn3ieDL8K3qDe6KayMS6ls,25121
+odoo/addons/account_commission/i18n/pt.po,sha256=I7Fm8AlHyDVZFYKxkYbUF--CY40xRPMwdnk-Fuxs1MI,24984
+odoo/addons/account_commission/i18n/pt_BR.po,sha256=-aTJVpwiQazpaU6l25w_cozfV6P_w_qYxXUppbKl95s,25295
+odoo/addons/account_commission/i18n/tr.po,sha256=9kHs3cenVzTjm-xpXN3R5iOwESHBKyUiUPt3dY_yvTQ,24787
 odoo/addons/account_commission/models/__init__.py,sha256=NAnZVtdmEwISK51Ipnoin5jHE3_bVPLsNghvuFcM3NI,88
-odoo/addons/account_commission/models/account_move.py,sha256=6P9SkOsurOvxTY4eA3hv72pHK95u1wYrkVYsLkSyJz4,9198
+odoo/addons/account_commission/models/account_move.py,sha256=mueEa0ggihbON9o7KlOc3pcMYiJbyI8RK79dCSKA-Z4,9988
 odoo/addons/account_commission/models/commission.py,sha256=OHzmB5iH-h4oQf5JQGV4EFpNOkAHxC1_0-j0g-8nDXE,576
 odoo/addons/account_commission/models/commission_settlement.py,sha256=0E4xBJAUGyeAjDkhv4BwlpT4JigYDjOppfXuspynl4Q,7197
 odoo/addons/account_commission/readme/CONFIGURE.rst,sha256=vUEhtDTSXiZc88gXBuQZIcSkM3CbkmzQQwdVgJfnbSA,466
@@ -26,18 +26,19 @@ odoo/addons/account_commission/security/account_commission_security.xml,sha256=p
 odoo/addons/account_commission/security/ir.model.access.csv,sha256=c0k8cFhVg1A4XCaUQ-mzJdLIotKKt1ltIYznK8ELhYE,883
 odoo/addons/account_commission/static/description/icon.png,sha256=ydxSIUuHSeE4CfMVsEzLjKKVdX4RicuPj8VGM2rBpBg,8219
 odoo/addons/account_commission/static/description/icon.svg,sha256=96b_cQ-F1XuDU6S5mDi9ioe0d22Vwn30uBDQ_3ZSi5w,17220
-odoo/addons/account_commission/static/description/index.html,sha256=VpheuNYaSuRHhlJgcZpIFhx_GdBvIRjDwRJPW4-henM,17173
+odoo/addons/account_commission/static/description/index.html,sha256=zcR4SFzAUITG_tgvp8sqHSNh2aSyC_qrZv3923tTdRQ,17391
 odoo/addons/account_commission/tests/__init__.py,sha256=bxd564RH-TWEpEJWbbc558dPFEJZCsH9JM8JF3-PMUM,38
-odoo/addons/account_commission/tests/test_account_commission.py,sha256=AMkGc0mPvdB9tIMBVec0w-zoE9pnapEteD8xFCJziOE,28724
+odoo/addons/account_commission/tests/test_account_commission.py,sha256=sKAItw4ZUk8IC7pbqLU6y5f1oMgRAqoGhl924qozvcs,30029
 odoo/addons/account_commission/views/account_move_views.xml,sha256=N6PGXNMSxgpwaz5HtydDTRX0stu3QzTX5vBICCksP9s,6600
 odoo/addons/account_commission/views/commission_settlement_views.xml,sha256=JG5sX13R5jdB79m1Pub2rwqhM1s3Kux3btXAbgv_sFk,3496
 odoo/addons/account_commission/views/commission_views.xml,sha256=oY2-WJ-lEn3gCoFMqStKObGT3LRkBxMmANm2MRhYuRE,614
 odoo/addons/account_commission/views/report_settlement_templates.xml,sha256=ypyl80zXsb0QxjgV14QTP1hwSnLWs-_B_OzlzZs431w,1581
 odoo/addons/account_commission/wizards/__init__.py,sha256=ddwjnl0fpZTw56iNQmRcDJ0Q1RfptMC23XtvW93Ofec,66
-odoo/addons/account_commission/wizards/commission_make_settle.py,sha256=k7yztap0JSa5q-QH71GXd0WFaUG639ETaAKrqdH8UE0,1717
+odoo/addons/account_commission/wizards/commission_make_settle.py,sha256=BTZIy9Z8Ic93okcYzBqvEV5uA71Qis3AzAnUv7thoJw,2108
+odoo/addons/account_commission/wizards/commission_make_settle_views.xml,sha256=ONG4xseHOg3Ssy3ZBw-xgLDwPizulwNCWQfZGyuBFVE,528
 odoo/addons/account_commission/wizards/wizard_invoice.py,sha256=SumDW3606uLS4d6L2rKjQbwdvfmIYovKark-EUMTve0,3162
 odoo/addons/account_commission/wizards/wizard_invoice.xml,sha256=Afx90Mccl0EjLzZ2dJa2dOikYhWxIY5tQ7objmca8gc,2292
-odoo_addon_account_commission-16.0.2.4.2.1.dist-info/METADATA,sha256=JVXmCC_es906lYZLjiT9ClsUQmekcFznbSQX1Pddv2s,6727
-odoo_addon_account_commission-16.0.2.4.2.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-odoo_addon_account_commission-16.0.2.4.2.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_account_commission-16.0.2.4.2.1.dist-info/RECORD,,
+odoo_addon_account_commission-16.0.2.5.0.1.dist-info/METADATA,sha256=H62r0hkkI9Omo38kxCczqBnqfO0t_WwW_74VOBnsbYw,6892
+odoo_addon_account_commission-16.0.2.5.0.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+odoo_addon_account_commission-16.0.2.5.0.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_account_commission-16.0.2.5.0.1.dist-info/RECORD,,