T2860 - FIX recurring invoice generation for annual contracts

[danpa32]

Two bugs in _generate_invoices / _should_skip_invoice_generation:

1. Loop range used advance_billing_months + 1 as upper bound, causing an off-by-one that generated too many invoices. Fixed to advance_billing_months + month_interval - 1 so the number of generated periods is consistent across all billing cycles:

   • monthly/advance=1 → 1 invoice, monthly/advance=12 → 12 invoices
   • annual/advance=12 → 2 invoices (current + next year)

2. Skip check did not exclude cancelled invoices, so a super-deleted (cancelled) invoice for a future period would permanently block regeneration of that period. Fixed by adding ("state", "not in", ["cancel"]) to the search domain.

[gemini-code-assist]

Code Review

This pull request reformats code, adjusts contributor list spacing, and updates the invoice generation logic to ignore cancelled invoices. It also modifies the offset range calculation in _generate_invoices. However, the new range calculation is missing starting_offset in its upper bound, which can result in an empty range and prevent invoices from being generated when there are waiting contracts.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

[greptile-apps]

Confidence Score: 5/5

The changes are narrowly scoped to recurring invoice period generation and duplicate-period checks.

No correctness or security issues were identified in the reviewed changes, and the implementation matches the described contract for advance billing and cancelled invoices.

T-Rex Logs

What T-Rex did

• Ran the invoice-range proof-of-work experiment and captured before and after logs to verify base range computation, the head-range calculation, and the observed extra monthly invoices for starting_offset=0 across scenarios.
• Ran the regeneration decision proof-of-work checks and captured before and after domain logs to verify how a state exclusion changes the _should_skip_invoice_generation flag and whether regeneration would proceed.

_{Ran code and verified through T-Rex}

_{Reviews (2): Last reviewed commit: "FIX loop range truncation when starting_..." | Re-trigger Greptile}

[greptile-apps]

Gift invoices still block

This base search now ignores cancelled moves, but the coupled sponsorship override has a separate gift-invoice lookup that still counts cancelled invoice lines: sponsorship_compassion/models/contract_group.py in compassion-modules. When a future gift invoice is cancelled, that override can still return has_all_gifts = True, so gift periods remain blocked even though regular contract periods can regenerate.

Artifacts

Repro: focused harness importing the real base and sponsorship override methods

• Contains supporting evidence from the run (text/x-python; charset=utf-8).

Repro: harness output showing cancelled gift line counted and skip result True

• Keeps the command output available without making the summary code-heavy.

_{Ran code and verified through T-Rex}

[ecino]

Looks good, thank you!