Fixup

Author: bosd

contract_invoice_offset/models/contract.py

@@ -42,15 +42,21 @@ def _compute_recurring_next_date(self):
                 and contract._origin.date_start != contract.date_start
                 or not recurring_next_date
             ):
+                kwargs = {
+                    "invoicing_offset_type": contract.invoicing_offset_type,
+                    "invoicing_offset_value": contract.invoicing_offset_value,
+                }
+                if hasattr(contract, "align_billing_cycle"):
+                    kwargs["align_billing_cycle"] = contract.align_billing_cycle
+
                 contract.recurring_next_date = self.get_next_invoice_date(
                     contract.next_period_date_start,
                     contract.recurring_invoicing_type,
                     contract.recurring_invoicing_offset,
                     contract.recurring_rule_type,
                     contract.recurring_interval,
                     max_date_end=contract.date_end,
-                    invoicing_offset_type=contract.invoicing_offset_type,
-                    invoicing_offset_value=contract.invoicing_offset_value,
+                    **kwargs,
                 )
             else:
                 contract.recurring_next_date = min(recurring_next_date)
@@ -70,6 +76,13 @@ def _compute_next_period_date_end(self):
         """Compute the end date of the next billing period."""
         # Override to pass offset settings
         for rec in self:
+            kwargs = {
+                "invoicing_offset_type": rec.invoicing_offset_type,
+                "invoicing_offset_value": rec.invoicing_offset_value,
+            }
+            if hasattr(rec, "align_billing_cycle"):
+                kwargs["align_billing_cycle"] = rec.align_billing_cycle
+
             rec.next_period_date_end = self.get_next_period_date_end(
                 rec.next_period_date_start,
                 rec.recurring_rule_type,
@@ -78,6 +91,5 @@ def _compute_next_period_date_end(self):
                 next_invoice_date=rec.recurring_next_date,
                 recurring_invoicing_type=rec.recurring_invoicing_type,
                 recurring_invoicing_offset=rec.recurring_invoicing_offset,
-                invoicing_offset_type=rec.invoicing_offset_type,
-                invoicing_offset_value=rec.invoicing_offset_value,
+                **kwargs,
             )

contract_invoice_offset/models/contract_line.py

@@ -22,6 +22,13 @@ class ContractLine(models.Model):
     )
     def _compute_next_period_date_end(self):
         for rec in self:
+            kwargs = {
+                "invoicing_offset_type": rec.contract_id.invoicing_offset_type,
+                "invoicing_offset_value": rec.contract_id.invoicing_offset_value,
+            }
+            if hasattr(rec.contract_id, "align_billing_cycle"):
+                kwargs["align_billing_cycle"] = rec.contract_id.align_billing_cycle
+
             rec.next_period_date_end = self.get_next_period_date_end(
                 rec.next_period_date_start,
                 rec.recurring_rule_type,
@@ -30,8 +37,7 @@ def _compute_next_period_date_end(self):
                 next_invoice_date=rec.recurring_next_date,
                 recurring_invoicing_type=rec.recurring_invoicing_type,
                 recurring_invoicing_offset=rec.recurring_invoicing_offset,
-                invoicing_offset_type=rec.contract_id.invoicing_offset_type,
-                invoicing_offset_value=rec.contract_id.invoicing_offset_value,
+                **kwargs,
             )
 
     @api.depends(
@@ -48,15 +54,21 @@ def _compute_recurring_next_date(self):
         # Override to look at contract_id for offset settings,
         # since lines don't (typically) have these fields themselves set independently.
         for rec in self:
+            kwargs = {
+                "invoicing_offset_type": rec.contract_id.invoicing_offset_type,
+                "invoicing_offset_value": rec.contract_id.invoicing_offset_value,
+            }
+            if hasattr(rec.contract_id, "align_billing_cycle"):
+                kwargs["align_billing_cycle"] = rec.contract_id.align_billing_cycle
+
             rec.recurring_next_date = self.get_next_invoice_date(
                 rec.next_period_date_start,
                 rec.recurring_invoicing_type,
                 rec.recurring_invoicing_offset,
                 rec.recurring_rule_type,
                 rec.recurring_interval,
                 max_date_end=rec.date_end,
-                invoicing_offset_type=rec.contract_id.invoicing_offset_type,
-                invoicing_offset_value=rec.contract_id.invoicing_offset_value,
+                **kwargs,
             )
 
     @api.constrains("recurring_next_date", "date_start")

contract_invoice_offset/models/contract_recurring_mixin.py

@@ -36,6 +36,7 @@ def get_next_invoice_date(
         max_date_end,
         invoicing_offset_type="days",
         invoicing_offset_value=0,
+        **kwargs,
     ):
         """Compute the date of the next invoice based on all parameters,
         including flexible offsets.
@@ -45,6 +46,9 @@ def get_next_invoice_date(
             recurring_rule_type,
             recurring_interval,
             max_date_end=max_date_end,
+            invoicing_offset_type=invoicing_offset_type,
+            invoicing_offset_value=invoicing_offset_value,
+            **kwargs,
         )
         if not next_period_date_end:
             return False
@@ -82,6 +86,7 @@ def get_next_period_date_end(
         recurring_invoicing_offset=False,
         invoicing_offset_type="days",
         invoicing_offset_value=0,
+        **kwargs,
     ):
         """Compute the end date for the next period, supporting flexible
         reverse calculation."""