[IMP]commission: method for improve inheritance

Author: matteo.tognini

account_commission/models/commission.py

@@ -14,3 +14,8 @@ class Commission(models.Model):
         "* 'Invoice Based': Commissions are settled when the invoice is issued.\n"
         "* 'Payment Based': Commissions are settled when the invoice is paid (or refunded).",
     )
+    settled_dates_based_on = fields.Selection(
+        [("inv", "Invoice Date"), ("payment", "Payment Date")],
+        default="inv",
+        help="Select the date to use for settling the commissions:\n",
+    )

account_commission/views/commission_views.xml

@@ -10,6 +10,10 @@
                     name="invoice_state"
                     attrs="{'required': [('settlement_type', '=', 'sale_invoice')]}"
                 />
+                <field
+                    name="settled_dates_based_on"
+                    attrs="{'invisible': [('invoice_state', '=', 'open')]}"
+                />
             </xpath>
         </field>
     </record>

account_commission/wizards/commission_make_settle.py

@@ -32,11 +32,32 @@ def _get_agent_lines(self, agent, date_to_agent):
         """Filter sales invoice agent lines for this type of settlement."""
         if self.settlement_type != "sale_invoice":
             return super()._get_agent_lines(agent, date_to_agent)
-        return self.env["account.invoice.line.agent"].search(
-            self._get_account_settle_domain(agent, date_to_agent),
-            order="invoice_date",
+
+        lines = self.env["account.invoice.line.agent"].search(
+            self._get_account_settle_domain(agent, date_to_agent)
         )
 
+        if agent.commission_id.settled_dates_based_on == "payment":
+            invoices = lines.mapped("invoice_id")
+            payment_date_by_inv = {}
+            for inv in invoices:
+                invoice_partials, _ = inv._get_reconciled_invoices_partials()
+                dates = [
+                    cp_line.date
+                    for _p, _amt, cp_line in invoice_partials
+                    if cp_line.date
+                ]
+                payment_date_by_inv[inv.id] = max(dates)
+
+            return lines.sorted(
+                key=lambda l: (
+                    payment_date_by_inv.get(l.invoice_id.id),
+                    l.id,
+                )
+            )
+
+        return lines.sorted(key=lambda l: (l.invoice_date, l.id))
+
     def _prepare_settlement_line_vals(self, settlement, line):
         """Prepare extra settlement values when the source is a sales invoice agent
         line.
@@ -56,3 +77,23 @@ def _prepare_settlement_line_vals(self, settlement, line):
     def action_settle(self):
         self = self.with_context(date_payment_to=self.date_payment_to)
         return super().action_settle()
+
+    def get_period_date(self, line):
+        if line.agent_id.commission_id.settled_dates_based_on != "payment":
+            return super().get_period_date(line)
+        return self.get_latest_payment_date(line.invoice_id)
+
+    def get_latest_payment_date(self, invoice):
+        """Get the latest payment date for an invoice."""
+        payments_dates = []
+        (
+            invoice_partials,
+            exchange_diff_moves,
+        ) = invoice._get_reconciled_invoices_partials()
+        for (
+            _partial,
+            _amount,
+            counterpart_line,
+        ) in invoice_partials:
+            payments_dates.append(counterpart_line.date)
+        return max(payments_dates)

commission/wizards/commission_make_settle.py

@@ -115,6 +115,10 @@ def _agent_lines_groupby(self, agent_line):
     def _agent_lines_sorted(self, agent_line):
         return agent_line.company_id.id, agent_line.currency_id.id
 
+    def get_period_date(self, line):
+        """Get the date to use for period calculation."""
+        return line.invoice_date
+
     def action_settle(self):
         self.ensure_one()
         settlement_obj = self.env["commission.settlement"]
@@ -145,8 +149,9 @@ def action_settle(self):
                     pos += 1
                     if line._skip_settlement():
                         continue
-                    if line.invoice_date > sett_to:
-                        sett_from = self._get_period_start(agent, line.invoice_date)
+                    date_to_compare = self.get_period_date(line)
+                    if date_to_compare > sett_to:
+                        sett_from = self._get_period_start(agent, date_to_compare)
                         sett_to = self._get_next_period_date(agent, sett_from)
                         sett_to -= timedelta(days=1)
                         settlement = self._get_settlement(