[IMP]l10n_it_riba: one expense per maturity

Author: matteo.tognini

l10n_it_riba/models/account.py

@@ -193,6 +193,27 @@ def month_check(self, invoice_date_due, all_date_due):
                     return True
         return False
 
+    def maturity_check(self, invoice_date_due, all_date_due):
+        """
+        Check if expenses should be applied based on exact maturity date.
+        Used for 'one_a_maturity' policy.
+
+        :param invoice_date_due: due date of current invoice
+        :param all_date_due: list of existing due dates for partner
+        :return: True if invoice_date_due already exists in all_date_due
+
+        Example:
+        - Invoice 1: Oct -> Dec (60 days) -> expenses YES
+        - Invoice 2: Nov -> Dec (30 days) -> expenses NO (Dec already exists)
+        - Invoice with 30/60 days: 2 different dates -> 2 expenses
+        """
+        self.ensure_one()
+        if self.partner_id.riba_policy_expenses == "one_a_maturity":
+            for d in all_date_due:
+                if invoice_date_due == d:
+                    return True
+        return False
+
     def _post(self, soft=True):
         inv_riba_no_bank = self.filtered(
             lambda x: x.is_riba_payment
@@ -236,18 +257,20 @@ def action_post(self):
                     _("Set a Service for Collection Fees in Company Config.")
                 )
             # ---- Apply Collection Fees on invoice only on first due date of the month
-            # ---- Get Date of first due date
+            # ---- Get all due dates with collection fees already applied
             move_line = self.env["account.move.line"].search(
                 [
                     ("partner_id", "=", invoice.partner_id.id),
                     ("move_id.invoice_payment_term_id.riba", "=", True),
-                    ("date_maturity", ">=", fields.Date.context_today(invoice)),
+                    ("move_id.state", "=", "posted"),
                 ]
             )
-            if not any(
-                line.due_cost_line for line in move_line.mapped("move_id.line_ids")
-            ):
-                move_line = self.env["account.move.line"]
+            # ---- Keep only lines from invoices that already have collection fees
+            move_line = move_line.filtered(
+                lambda line: any(
+                    inv_line.due_cost_line for inv_line in line.move_id.invoice_line_ids
+                )
+            )
             # ---- Filtered recordset with date_maturity
             move_line = move_line.filtered(lambda line: line.date_maturity is not False)
             # ---- Sorted
@@ -265,7 +288,18 @@ def action_post(self):
                 untaxed_amount_currency=invoice.amount_untaxed,
             )
             for pay_date in pterm_list:
-                if not invoice.month_check(pay_date["date"], previous_date_due):
+                # Check if expenses should be applied based on policy
+                should_skip_expense = False
+                if invoice.partner_id.riba_policy_expenses == "one_a_maturity":
+                    should_skip_expense = invoice.maturity_check(
+                        pay_date["date"], previous_date_due
+                    )
+                else:
+                    should_skip_expense = invoice.month_check(
+                        pay_date["date"], previous_date_due
+                    )
+
+                if not should_skip_expense:
                     # ---- Get Line values for service product
                     service_prod = invoice.company_id.due_cost_service_id
                     account = service_prod.product_tmpl_id.get_product_accounts(

l10n_it_riba/models/partner.py

@@ -39,7 +39,8 @@ def _domain_property_riba_supplier_company_bank_id(self):
     riba_policy_expenses = fields.Selection(
         [
             ("one_a_month", "More invoices, one expense per Month"),
-            ("unlimited", "One expense per maturity"),
+            ("unlimited", "One expense per invoice"),
+            ("one_a_maturity", "One expense per Maturity"),
         ],
         default="one_a_month",
         string="Ri.Ba. Policy expenses",