From 7d63453356724392845aea62c3188b32cef471f1 Mon Sep 17 00:00:00 2001 From: bosd <5e2fd43-d292-4c90-9d1f-74ff3436329a@anonaddy.me> Date: Mon, 29 Dec 2025 20:32:29 +0100 Subject: [PATCH 1/4] [ADD] contract_invoice_offset: Advanced pre-paid invoicing --- contract_invoice_offset/README.rst | 112 +++++ contract_invoice_offset/__init__.py | 1 + contract_invoice_offset/__manifest__.py | 19 + .../demo/contract_demo.xml | 52 ++ contract_invoice_offset/models/__init__.py | 3 + contract_invoice_offset/models/contract.py | 87 ++++ .../models/contract_line.py | 107 ++++ .../models/contract_recurring_mixin.py | 138 ++++++ contract_invoice_offset/pyproject.toml | 3 + contract_invoice_offset/readme/CONTEXT.md | 12 + .../readme/CONTRIBUTORS.md | 1 + contract_invoice_offset/readme/DESCRIPTION.md | 3 + contract_invoice_offset/readme/USAGE.md | 9 + .../static/description/icon.png | Bin 0 -> 10254 bytes .../static/description/index.html | 458 ++++++++++++++++++ contract_invoice_offset/tests/__init__.py | 1 + .../tests/test_invoice_offset.py | 139 ++++++ .../views/contract_view.xml | 17 + 18 files changed, 1162 insertions(+) create mode 100644 contract_invoice_offset/README.rst create mode 100644 contract_invoice_offset/__init__.py create mode 100644 contract_invoice_offset/__manifest__.py create mode 100644 contract_invoice_offset/demo/contract_demo.xml create mode 100644 contract_invoice_offset/models/__init__.py create mode 100644 contract_invoice_offset/models/contract.py create mode 100644 contract_invoice_offset/models/contract_line.py create mode 100644 contract_invoice_offset/models/contract_recurring_mixin.py create mode 100644 contract_invoice_offset/pyproject.toml create mode 100644 contract_invoice_offset/readme/CONTEXT.md create mode 100644 contract_invoice_offset/readme/CONTRIBUTORS.md create mode 100644 contract_invoice_offset/readme/DESCRIPTION.md create mode 100644 contract_invoice_offset/readme/USAGE.md create mode 100644 contract_invoice_offset/static/description/icon.png create mode 100644 contract_invoice_offset/static/description/index.html create mode 100644 contract_invoice_offset/tests/__init__.py create mode 100644 contract_invoice_offset/tests/test_invoice_offset.py create mode 100644 contract_invoice_offset/views/contract_view.xml diff --git a/contract_invoice_offset/README.rst b/contract_invoice_offset/README.rst new file mode 100644 index 0000000000..a0962a32bc --- /dev/null +++ b/contract_invoice_offset/README.rst @@ -0,0 +1,112 @@ +======================= +Contract Invoice Offset +======================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:cc0cdda8117975e2abacbfce602f28372973e27343551ddfcdb69fb65024eb5d + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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 + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github + :target: https://github.com/OCA/contract/tree/18.0/contract_invoice_offset + :alt: OCA/contract +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/contract-18-0/contract-18-0-contract_invoice_offset + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/contract&target_branch=18.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends the **Contract** module to provide flexible +invoicing offsets. It allows you to define offsets in Days, Weeks, +Months, or Years, enabling scenarios such as **Pre-paid + 1 month in +advance** (e.g. Invoicing January's service in December). + +**Table of contents** + +.. contents:: + :local: + +Use Cases / Context +=================== + +In the standard behavior of the Contract module, invoicing offsets are +restricted to a fixed number of days. While this works for many cases, +it is difficult to configure reliable "in advance" invoicing for +intervals like months, given the varying number of days in each month. + +In some business scenarios, a contract must be invoiced exactly one +month in advance (e.g., invoicing January service in December) or with a +specific delay in weeks or years. + +This module introduces flexible invoicing offsets, allowing users to +define offsets in Days, Weeks, Months, or Years, ensuring the invoice +date is logically consistent with the billing period regardless of +calendar variations. + +Usage +===== + +To use this module: + +1. Go to **Accounting > Customers > Contracts**. +2. Select or create a contract. +3. In the **Invoicing** section: + + - Set **Invoicing type** (e.g., Pre-paid). + - Set **Invoicing Offset Type** (e.g., Months). + - Set **Invoicing Offset Value** (e.g., -1 for 1 month in advance). + +4. The **Date of Next Invoice** will be calculated based on your + configuration. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +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 +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +------- + +* bosd + +Contributors +------------ + +- bosd + +Maintainers +----------- + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/contract `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/contract_invoice_offset/__init__.py b/contract_invoice_offset/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/contract_invoice_offset/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/contract_invoice_offset/__manifest__.py b/contract_invoice_offset/__manifest__.py new file mode 100644 index 0000000000..92c0c18c32 --- /dev/null +++ b/contract_invoice_offset/__manifest__.py @@ -0,0 +1,19 @@ +{ + "name": "Contract Invoice Offset", + "summary": "Flexible invoicing offsets (e.g. 1 month in advance)", + "version": "19.0.1.0.0", + "category": "Accounting", + "website": "https://github.com/OCA/contract", + "author": "bosd, Odoo Community Association (OCA)", + "license": "AGPL-3", + "depends": [ + "contract", + ], + "data": [ + "views/contract_view.xml", + ], + "demo": [ + "demo/contract_demo.xml", + ], + "installable": True, +} diff --git a/contract_invoice_offset/demo/contract_demo.xml b/contract_invoice_offset/demo/contract_demo.xml new file mode 100644 index 0000000000..6f6a82e096 --- /dev/null +++ b/contract_invoice_offset/demo/contract_demo.xml @@ -0,0 +1,52 @@ + + + + Demo Contract: 1 Month Advance + + 1 + monthly + + pre-paid + months + -1 + + + + + Demo Contract: 2 Weeks Delay + + 1 + monthly + + post-paid + weeks + 2 + + + diff --git a/contract_invoice_offset/models/__init__.py b/contract_invoice_offset/models/__init__.py new file mode 100644 index 0000000000..371f6a16eb --- /dev/null +++ b/contract_invoice_offset/models/__init__.py @@ -0,0 +1,3 @@ +from . import contract_recurring_mixin +from . import contract +from . import contract_line diff --git a/contract_invoice_offset/models/contract.py b/contract_invoice_offset/models/contract.py new file mode 100644 index 0000000000..2b2bca6816 --- /dev/null +++ b/contract_invoice_offset/models/contract.py @@ -0,0 +1,87 @@ +# Copyright 2025 bosd +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, models + + +class ContractContract(models.Model): + _inherit = "contract.contract" + + @api.depends( + "next_period_date_start", + "recurring_invoicing_type", + "recurring_invoicing_offset", + "recurring_rule_type", + "recurring_interval", + "date_end", + "contract_line_ids.recurring_next_date", + "contract_line_ids.is_canceled", + "invoicing_offset_type", + "invoicing_offset_value", + ) + def _compute_recurring_next_date(self): + for contract in self: + recurring_next_date = contract.contract_line_ids.filtered( + lambda line: ( + line.recurring_next_date + and not line.is_canceled + and (not line.display_type or line.is_recurring_note) + ) + ).mapped("recurring_next_date") + # we give priority to computation from date_start if modified + if ( + contract._origin + 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, + **kwargs, + ) + else: + contract.recurring_next_date = min(recurring_next_date) + + @api.depends( + "next_period_date_start", + "recurring_invoicing_type", + "recurring_invoicing_offset", + "recurring_rule_type", + "recurring_interval", + "date_end", + "recurring_next_date", + "invoicing_offset_type", + "invoicing_offset_value", + ) + 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, + rec.recurring_interval, + max_date_end=rec.date_end, + next_invoice_date=rec.recurring_next_date, + recurring_invoicing_type=rec.recurring_invoicing_type, + recurring_invoicing_offset=rec.recurring_invoicing_offset, + **kwargs, + ) diff --git a/contract_invoice_offset/models/contract_line.py b/contract_invoice_offset/models/contract_line.py new file mode 100644 index 0000000000..2179788461 --- /dev/null +++ b/contract_invoice_offset/models/contract_line.py @@ -0,0 +1,107 @@ +# Copyright 2025 bosd +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from dateutil.relativedelta import relativedelta + +from odoo import api, models + + +class ContractLine(models.Model): + _inherit = "contract.line" + + @api.depends( + "next_period_date_start", + "recurring_invoicing_type", + "recurring_invoicing_offset", + "recurring_rule_type", + "recurring_interval", + "date_end", + "contract_id.invoicing_offset_type", + "contract_id.invoicing_offset_value", + "recurring_next_date", + ) + 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, + rec.recurring_interval, + max_date_end=rec.date_end, + next_invoice_date=rec.recurring_next_date, + recurring_invoicing_type=rec.recurring_invoicing_type, + recurring_invoicing_offset=rec.recurring_invoicing_offset, + **kwargs, + ) + + @api.depends( + "next_period_date_start", + "recurring_invoicing_type", + "recurring_invoicing_offset", + "recurring_rule_type", + "recurring_interval", + "date_end", + "contract_id.invoicing_offset_type", + "contract_id.invoicing_offset_value", + ) + 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, + **kwargs, + ) + + @api.constrains("recurring_next_date", "date_start") + def _check_recurring_next_date_start_date(self): + # Filter out lines that have a negative offset (advance payment) + lines_to_check = self.filtered( + lambda line: line.contract_id.invoicing_offset_value >= 0 + ) + + if lines_to_check: + super(ContractLine, lines_to_check)._check_recurring_next_date_start_date() + return + + def _get_period_to_invoice( + self, last_date_invoiced, recurring_next_date, stop_at_date_end=True + ): + self.ensure_one() + if not recurring_next_date: + return False, False, False + first_date_invoiced = ( + last_date_invoiced + relativedelta(days=1) + if last_date_invoiced + else self.date_start + ) + last_date_invoiced = self.get_next_period_date_end( + first_date_invoiced, + self.recurring_rule_type, + self.recurring_interval, + max_date_end=(self.date_end if stop_at_date_end else False), + next_invoice_date=recurring_next_date, + recurring_invoicing_type=self.recurring_invoicing_type, + recurring_invoicing_offset=self.recurring_invoicing_offset, + invoicing_offset_type=self.contract_id.invoicing_offset_type, + invoicing_offset_value=self.contract_id.invoicing_offset_value, + ) + return first_date_invoiced, last_date_invoiced, recurring_next_date diff --git a/contract_invoice_offset/models/contract_recurring_mixin.py b/contract_invoice_offset/models/contract_recurring_mixin.py new file mode 100644 index 0000000000..2b0bc5dc5a --- /dev/null +++ b/contract_invoice_offset/models/contract_recurring_mixin.py @@ -0,0 +1,138 @@ +# Copyright 2025 bosd +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from dateutil.relativedelta import relativedelta + +from odoo import api, fields, models + + +class ContractRecurringMixin(models.AbstractModel): + _inherit = "contract.recurring.mixin" + + invoicing_offset_type = fields.Selection( + [ + ("days", "Days"), + ("weeks", "Weeks"), + ("months", "Months"), + ("years", "Years"), + ], + default="days", + required=True, + ) + invoicing_offset_value = fields.Integer( + default=0, + help="Positive value delays invoice, negative value invoices in advance. " + "E.g., -1 for 1 month in advance.", + ) + + @api.model + def get_next_invoice_date( + self, + next_period_date_start, + recurring_invoicing_type, + recurring_invoicing_offset, + recurring_rule_type, + recurring_interval, + 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. + """ + next_period_date_end = self.get_next_period_date_end( + next_period_date_start, + 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 + + # Calculate base date + if recurring_invoicing_type == "pre-paid": + base_date = next_period_date_start + else: + base_date = next_period_date_end + + # Apply offset + # First, apply the original days-based offset for consistency. + base_date += relativedelta(days=recurring_invoicing_offset) + # Then, apply the new flexible offset. + if invoicing_offset_type == "days": + return base_date + relativedelta(days=invoicing_offset_value) + elif invoicing_offset_type == "weeks": + return base_date + relativedelta(weeks=invoicing_offset_value) + elif invoicing_offset_type == "months": + return base_date + relativedelta(months=invoicing_offset_value) + elif invoicing_offset_type == "years": + return base_date + relativedelta(years=invoicing_offset_value) + + return base_date + + @api.model + def get_next_period_date_end( + self, + next_period_date_start, + recurring_rule_type, + recurring_interval, + max_date_end, + next_invoice_date=False, + recurring_invoicing_type=False, + 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.""" + if not next_period_date_start or ( + max_date_end and next_period_date_start > max_date_end + ): + return False + + if not next_invoice_date: + # Regular case: use relative delta (unchanged from base) + next_period_date_end = ( + next_period_date_start + + self.get_relative_delta(recurring_rule_type, recurring_interval) + - relativedelta(days=1) + ) + else: + # Forced invoice date: back-calculate period end + # We need to reverse the offset to find the base date (start or end) + + # 1. Reverse the offset to get the 'base date' (which is start or end) + base_date = next_invoice_date + # First, reverse the new flexible offset. + if invoicing_offset_type == "days": + base_date -= relativedelta(days=invoicing_offset_value) + elif invoicing_offset_type == "weeks": + base_date -= relativedelta(weeks=invoicing_offset_value) + elif invoicing_offset_type == "months": + base_date -= relativedelta(months=invoicing_offset_value) + elif invoicing_offset_type == "years": + base_date -= relativedelta(years=invoicing_offset_value) + # Then, reverse the original days-based offset. + base_date -= relativedelta(days=recurring_invoicing_offset) + + # 2. From base date, derive period end. + if recurring_invoicing_type == "pre-paid": + # base_date is Start Date + # End Date = Start Date + Duration - 1 day + next_period_date_end = ( + base_date + + self.get_relative_delta(recurring_rule_type, recurring_interval) + - relativedelta(days=1) + ) + else: # post-paid + # base_date is End Date + next_period_date_end = base_date + + if max_date_end and next_period_date_end > max_date_end: + next_period_date_end = max_date_end + return next_period_date_end diff --git a/contract_invoice_offset/pyproject.toml b/contract_invoice_offset/pyproject.toml new file mode 100644 index 0000000000..4231d0cccb --- /dev/null +++ b/contract_invoice_offset/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/contract_invoice_offset/readme/CONTEXT.md b/contract_invoice_offset/readme/CONTEXT.md new file mode 100644 index 0000000000..2570737a1a --- /dev/null +++ b/contract_invoice_offset/readme/CONTEXT.md @@ -0,0 +1,12 @@ +In the standard behavior of the Contract module, invoicing offsets are restricted +to a fixed number of days. While this works for many cases, it is difficult to +configure reliable "in advance" invoicing for intervals like months, given the +varying number of days in each month. + +In some business scenarios, a contract must be invoiced exactly one month +in advance (e.g., invoicing January service in December) or with a specific +delay in weeks or years. + +This module introduces flexible invoicing offsets, allowing users to define +offsets in Days, Weeks, Months, or Years, ensuring the invoice date is +logically consistent with the billing period regardless of calendar variations. diff --git a/contract_invoice_offset/readme/CONTRIBUTORS.md b/contract_invoice_offset/readme/CONTRIBUTORS.md new file mode 100644 index 0000000000..611190d79a --- /dev/null +++ b/contract_invoice_offset/readme/CONTRIBUTORS.md @@ -0,0 +1 @@ +* bosd diff --git a/contract_invoice_offset/readme/DESCRIPTION.md b/contract_invoice_offset/readme/DESCRIPTION.md new file mode 100644 index 0000000000..cd8d6800b4 --- /dev/null +++ b/contract_invoice_offset/readme/DESCRIPTION.md @@ -0,0 +1,3 @@ +This module extends the **Contract** module to provide flexible invoicing offsets. +It allows you to define offsets in Days, Weeks, Months, or Years, enabling scenarios +such as **Pre-paid + 1 month in advance** (e.g. Invoicing January's service in December). diff --git a/contract_invoice_offset/readme/USAGE.md b/contract_invoice_offset/readme/USAGE.md new file mode 100644 index 0000000000..b367fcd81f --- /dev/null +++ b/contract_invoice_offset/readme/USAGE.md @@ -0,0 +1,9 @@ +To use this module: + +1. Go to **Accounting > Customers > Contracts**. +2. Select or create a contract. +3. In the **Invoicing** section: + * Set **Invoicing type** (e.g., Pre-paid). + * Set **Invoicing Offset Type** (e.g., Months). + * Set **Invoicing Offset Value** (e.g., -1 for 1 month in advance). +4. The **Date of Next Invoice** will be calculated based on your configuration. diff --git a/contract_invoice_offset/static/description/icon.png b/contract_invoice_offset/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1dcc49c24f364e9adf0afbc6fc0bac6dbecdeb11 GIT binary patch literal 10254 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 + + + + +Contract Invoice Offset + + + +
+

Contract Invoice Offset

+ + +

Beta License: AGPL-3 OCA/contract Translate me on Weblate Try me on Runboat

+

This module extends the Contract module to provide flexible +invoicing offsets. It allows you to define offsets in Days, Weeks, +Months, or Years, enabling scenarios such as Pre-paid + 1 month in +advance (e.g. Invoicing January’s service in December).

+

Table of contents

+ +
+

Use Cases / Context

+

In the standard behavior of the Contract module, invoicing offsets are +restricted to a fixed number of days. While this works for many cases, +it is difficult to configure reliable “in advance” invoicing for +intervals like months, given the varying number of days in each month.

+

In some business scenarios, a contract must be invoiced exactly one +month in advance (e.g., invoicing January service in December) or with a +specific delay in weeks or years.

+

This module introduces flexible invoicing offsets, allowing users to +define offsets in Days, Weeks, Months, or Years, ensuring the invoice +date is logically consistent with the billing period regardless of +calendar variations.

+
+
+

Usage

+

To use this module:

+
    +
  1. Go to Accounting > Customers > Contracts.
    2. +
  2. Select or create a contract.
    3. +
  3. In the Invoicing section:
      +
    • Set Invoicing type (e.g., Pre-paid).
      • +
    • Set Invoicing Offset Type (e.g., Months).
      • +
    • Set Invoicing Offset Value (e.g., -1 for 1 month in advance).
      • +
    +
    4. +
  4. The Date of Next Invoice will be calculated based on your +configuration.
    5. +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +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 +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • bosd
    • +
+
+
+

Contributors

+
    +
  • bosd
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+ +Odoo Community Association + +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/contract project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/contract_invoice_offset/tests/__init__.py b/contract_invoice_offset/tests/__init__.py new file mode 100644 index 0000000000..80ac4899b9 --- /dev/null +++ b/contract_invoice_offset/tests/__init__.py @@ -0,0 +1 @@ +from . import test_invoice_offset diff --git a/contract_invoice_offset/tests/test_invoice_offset.py b/contract_invoice_offset/tests/test_invoice_offset.py new file mode 100644 index 0000000000..d319d380f3 --- /dev/null +++ b/contract_invoice_offset/tests/test_invoice_offset.py @@ -0,0 +1,139 @@ +# Copyright 2024 bosd +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields +from odoo.tests import common, tagged + + +@tagged("post_install", "-at_install") +class TestContractInvoiceOffset(common.TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.partner = cls.env["res.partner"].create({"name": "Test Partner"}) + cls.product = cls.env["product.product"].create( + {"name": "Test Service", "type": "service"} + ) + cls.contract = cls.env["contract.contract"].create( + { + "name": "Test Offset Contract", + "partner_id": cls.partner.id, + "recurring_interval": 1, + "recurring_rule_type": "monthly", + "date_start": "2025-01-01", + "contract_line_ids": [ + ( + 0, + 0, + { + "product_id": cls.product.id, + "name": "Service", + "quantity": 1, + "price_unit": 100, + "recurring_interval": 1, + "recurring_rule_type": "monthly", + "date_start": "2025-01-01", + }, + ) + ], + } + ) + + def test_prepaid_advance_one_month(self): + """Test Pre-paid + 1 month advance (offset -1 month).""" + self.contract.write( + { + "recurring_invoicing_type": "pre-paid", + "recurring_invoicing_offset": 0, # Explicitly set to 0 for pre-paid + "invoicing_offset_type": "months", + "invoicing_offset_value": -1, + } + ) + # Next Invoice for 2025-01-01 start is 2025-01-01 + # (with recurring_invoicing_offset 0). + # With -1 month offset, it should be 2024-12-01. + self.contract._compute_recurring_next_date() + self.assertEqual( + self.contract.recurring_next_date, + fields.Date.to_date("2024-12-01"), + "Invoice date should be one month prior to start date", + ) + + def test_postpaid_delayed_one_month(self): + """Test Post-paid + 1 month delay.""" + self.contract.write( + { + "recurring_invoicing_type": "post-paid", + "recurring_invoicing_offset": 1, # Explicitly set to 1 day + "invoicing_offset_type": "months", + "invoicing_offset_value": 1, + } + ) + + self.contract._compute_recurring_next_date() + # End date of first period (2025-01-01 monthly) is 2025-01-31. + # Apply recurring_invoicing_offset first (1 day), then invoicing_offset_value. + # Next Invoice Date = 2025-01-31 + 1 day + 1 month = 2025-03-01. + self.assertEqual( + self.contract.recurring_next_date, + fields.Date.to_date("2025-03-01"), + "Invoice date should be 1 day + 1 month after period end", + ) + + def test_days_fallback(self): + """Test that 'days' works with consistent behavior + (both recurring_invoicing_offset and invoicing_offset_value).""" + self.contract.write( + { + "recurring_invoicing_type": "post-paid", + "recurring_invoicing_offset": 1, # Explicitly set to 1 day + "invoicing_offset_type": "days", + "invoicing_offset_value": 5, # 5 additional days + } + ) + # With post-paid, base_date is period end (Jan 31 for Jan monthly). + # Apply recurring_invoicing_offset first (1 day), then invoicing_offset_value. + # Our logic: base_date (Jan 31) + recurring_invoicing_offset (1) + + # invoicing_offset_value (5) = Jan 31 + 6 days = Feb 6. + self.contract._compute_recurring_next_date() + self.assertEqual( + self.contract.recurring_next_date, + fields.Date.to_date("2025-02-06"), + "Invoice date should be 6 days after period end " + "(1 from recurring_invoicing_offset + 5 from invoicing_offset_value)", + ) + + def test_apply_offset_on_invoice_creation(self): + """Verify that invoice creation respects the offsets.""" + self.contract.write( + { + "recurring_invoicing_type": "pre-paid", + "invoicing_offset_type": "months", + "invoicing_offset_value": -1, + } + ) + # Next date is 2024-12-01. If we run invoice creation for that date, + # we expect an invoice for the period 2025-01-01 to 2025-01-31. + + # Force next date just to be sure + self.contract.recurring_next_date = "2024-12-01" + + invoice = self.contract._recurring_create_invoice() + self.assertTrue(invoice, "Invoice should be created") + + # Check Invoice Date + self.assertEqual( + invoice.invoice_date, + fields.Date.to_date("2024-12-01"), + "Invoice date should be Dec 1st", + ) + + # Check Line Description or Metadata if available to verify period? + # Standard contract creates description "Service" (or template). + # We can check contract line's last_date_invoiced. + line = self.contract.contract_line_ids[0] + self.assertEqual( + line.last_date_invoiced, + fields.Date.to_date("2025-01-31"), + "Last date invoiced should be end of the service period (Jan 31)", + ) diff --git a/contract_invoice_offset/views/contract_view.xml b/contract_invoice_offset/views/contract_view.xml new file mode 100644 index 0000000000..95a93fe8b4 --- /dev/null +++ b/contract_invoice_offset/views/contract_view.xml @@ -0,0 +1,17 @@ + + + + contract.contract.form.inherit + contract.contract + + + + + + + + + From 65eeb15fa6d7f52b708863664a236820b8d96700 Mon Sep 17 00:00:00 2001 From: bosd <5e2fd43-d292-4c90-9d1f-74ff3436329a@anonaddy.me> Date: Mon, 29 Dec 2025 20:33:03 +0100 Subject: [PATCH 2/4] [DO NOT MERGE] --- test-requirements.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test-requirements.txt diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 0000000000..b4db471c5f --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1 @@ +odoo-addon-contract @ git+https://github.com/OCA/contract@refs/pull/1312/head#subdirectory=contract From de21c7777a3419fbb6614dfa57ccfd70707f9d2a Mon Sep 17 00:00:00 2001 From: bosd <5e2fd43-d292-4c90-9d1f-74ff3436329a@anonaddy.me> Date: Fri, 2 Jan 2026 13:53:51 +0100 Subject: [PATCH 3/4] Fixup Interaction with align to start --- contract_invoice_offset/models/contract_line.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/contract_invoice_offset/models/contract_line.py b/contract_invoice_offset/models/contract_line.py index 2179788461..60dcb0320c 100644 --- a/contract_invoice_offset/models/contract_line.py +++ b/contract_invoice_offset/models/contract_line.py @@ -93,6 +93,13 @@ def _get_period_to_invoice( if last_date_invoiced else self.date_start ) + kwargs = { + "invoicing_offset_type": self.contract_id.invoicing_offset_type, + "invoicing_offset_value": self.contract_id.invoicing_offset_value, + } + if hasattr(self.contract_id, "align_billing_cycle"): + kwargs["align_billing_cycle"] = self.contract_id.align_billing_cycle + last_date_invoiced = self.get_next_period_date_end( first_date_invoiced, self.recurring_rule_type, @@ -101,7 +108,6 @@ def _get_period_to_invoice( next_invoice_date=recurring_next_date, recurring_invoicing_type=self.recurring_invoicing_type, recurring_invoicing_offset=self.recurring_invoicing_offset, - invoicing_offset_type=self.contract_id.invoicing_offset_type, - invoicing_offset_value=self.contract_id.invoicing_offset_value, + **kwargs, ) return first_date_invoiced, last_date_invoiced, recurring_next_date From a9fc61afa0440a0459aaed300b705ca7e97bd617 Mon Sep 17 00:00:00 2001 From: bosd <5e2fd43-d292-4c90-9d1f-74ff3436329a@anonaddy.me> Date: Fri, 2 Jan 2026 14:12:46 +0100 Subject: [PATCH 4/4] Fixup Interaction with align to start2 --- .../models/contract_recurring_mixin.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/contract_invoice_offset/models/contract_recurring_mixin.py b/contract_invoice_offset/models/contract_recurring_mixin.py index 2b0bc5dc5a..7574c1065c 100644 --- a/contract_invoice_offset/models/contract_recurring_mixin.py +++ b/contract_invoice_offset/models/contract_recurring_mixin.py @@ -95,6 +95,15 @@ def get_next_period_date_end( ): return False + # Check for billing cycle alignment from contract_invoice_align_start + align_billing_cycle = kwargs.get("align_billing_cycle") + if align_billing_cycle and next_period_date_start.day != 1: + # Force end to be end of the current month (alignment takes precedence) + next_period_date_end = next_period_date_start + relativedelta(day=31) + if max_date_end and next_period_date_end > max_date_end: + next_period_date_end = max_date_end + return next_period_date_end + if not next_invoice_date: # Regular case: use relative delta (unchanged from base) next_period_date_end = (