diff --git a/contract_sale_invoice_merge/README.rst b/contract_sale_invoice_merge/README.rst new file mode 100644 index 0000000000..a9ff32fecf --- /dev/null +++ b/contract_sale_invoice_merge/README.rst @@ -0,0 +1,104 @@ +=========================== +Contract Sale Invoice Merge +=========================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:158cb8c1138bb1073a163e0eeb87344c70ea0716ba8ccbc7f6e485daeb3f8ddd + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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_sale_invoice_merge + :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_sale_invoice_merge + :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| + +Allows to group invoice lines in a minimal amount of invoices, whether +they are generated from a Sale Order or from a Contract, according to +grouping fields. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +The field do_not_group_move allows to disable grouping of specific +records. The default value can be configured in the config parameters. + +Usage +===== + +1. Create Sale Orders ready to be invoiced (confirmed). +2. Create Contracts ready to be invoiced (recurring_next_date <= today). +3. Run the contract_sale_invoice_merge_cron. +4. All invoices are created, and grouped according to the grouping + fields. + +Known issues / Roadmap +====================== + +- When a contract line is invoiced several times in a row, it still + creates several invoices. An improvement could be to group these + invoices together. +- Refactor the method \_merge_invoices_values to allow flexible + configuration of the merged fields. + +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 +------- + +* ACSONE SA/NV + +Contributors +------------ + +- `Acsone SA/NV `__: + + - Alexis Anthonissen + +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_sale_invoice_merge/__init__.py b/contract_sale_invoice_merge/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/contract_sale_invoice_merge/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/contract_sale_invoice_merge/__manifest__.py b/contract_sale_invoice_merge/__manifest__.py new file mode 100644 index 0000000000..4516f97fcb --- /dev/null +++ b/contract_sale_invoice_merge/__manifest__.py @@ -0,0 +1,24 @@ +# Copyright 2026 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Contract Sale Invoice Merge", + "summary": """Adds a cron that creates merged invoices according to grouping + fields.""", + "version": "18.0.1.0.0", + "license": "AGPL-3", + "author": "ACSONE SA/NV, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/contract", + "depends": [ + "product_contract", + "queue_job_cron", + ], + "data": [ + "security/ir.model.access.csv", + "data/contract_sale_invoice_merge_cron.xml", + "data/queue_job_channel.xml", + "data/queue_job_function.xml", + "views/contract_contract.xml", + "views/res_config_settings.xml", + ], +} diff --git a/contract_sale_invoice_merge/data/contract_sale_invoice_merge_cron.xml b/contract_sale_invoice_merge/data/contract_sale_invoice_merge_cron.xml new file mode 100644 index 0000000000..012a2819d0 --- /dev/null +++ b/contract_sale_invoice_merge/data/contract_sale_invoice_merge_cron.xml @@ -0,0 +1,20 @@ + + + + + Generate Merged Recurring Invoices from Contracts and Sale Orders + + code + model.cron_group_recurring_create_invoice() + + 1 + days + + + diff --git a/contract_sale_invoice_merge/data/queue_job_channel.xml b/contract_sale_invoice_merge/data/queue_job_channel.xml new file mode 100644 index 0000000000..67a216532e --- /dev/null +++ b/contract_sale_invoice_merge/data/queue_job_channel.xml @@ -0,0 +1,9 @@ + + + + + CONTRACT_MERGE_INVOICE + + + diff --git a/contract_sale_invoice_merge/data/queue_job_function.xml b/contract_sale_invoice_merge/data/queue_job_function.xml new file mode 100644 index 0000000000..bd9f0ce042 --- /dev/null +++ b/contract_sale_invoice_merge/data/queue_job_function.xml @@ -0,0 +1,16 @@ + + + + + + cron_group_recurring_create_invoice + + + diff --git a/contract_sale_invoice_merge/models/__init__.py b/contract_sale_invoice_merge/models/__init__.py new file mode 100644 index 0000000000..c722ec7578 --- /dev/null +++ b/contract_sale_invoice_merge/models/__init__.py @@ -0,0 +1,6 @@ +from . import account_move_group +from . import account_move_group_mixin +from . import contract +from . import res_company +from . import res_config_settings +from . import sale_order diff --git a/contract_sale_invoice_merge/models/account_move_group.py b/contract_sale_invoice_merge/models/account_move_group.py new file mode 100644 index 0000000000..3ea384dc25 --- /dev/null +++ b/contract_sale_invoice_merge/models/account_move_group.py @@ -0,0 +1,128 @@ +# Copyright 2026 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import Command, api, fields, models + +from odoo.addons.account.models.account_move import AccountMove + +from .account_move_group_mixin import AccountMoveGroupMixin + + +class AccountMoveGroup(models.TransientModel): + _name = "account.move.group" + _description = "Account Move Group" + + partner_invoice_id = fields.Many2one(comodel_name="res.partner") + payment_term_id = fields.Many2one(comodel_name="account.payment.term") + user_id = fields.Many2one(comodel_name="res.users") + fiscal_position_id = fields.Many2one(comodel_name="account.fiscal.position") + journal_id = fields.Many2one(comodel_name="account.journal") + + @api.model + def _get_groupable_models(self): + return list(self.env["account.move.group.mixin"]._inherit_children) + + def _get_groups_by_recordset(self, date_ref): + groups = {} + + for model_name in self._get_groupable_models(): + Model = self.env[model_name] + if not isinstance(Model, AccountMoveGroupMixin): + continue + + domain = Model._get_group_invoice_domain(date_ref) + records = Model.search(domain=domain) + for rec in records: + if rec.do_not_group_move: + # Create separate groups for records that cannot be grouped + groups[model_name + str(rec.id)] = {model_name: rec} + + grouping_vals = rec._get_invoice_grouping_dict() + grouping_key = tuple(sorted(grouping_vals.items())) + if grouping_key not in groups: + # Initialize empty recordsets for all registered models + groups[grouping_key] = { + m: self.env[m] for m in self._get_groupable_models() + } + + groups[grouping_key][model_name] |= rec + + return groups + + @api.model + def _merge_invoices_values(self, invoices_values, date_ref=False): + """ + This method merges the given invoices values list into one. + All invoices are merged into the first one of the list. + :param invoices_values: list of dictionaries (invoices values) + :return: list containing the dictionary of values of the result invoice + """ + if not invoices_values: + return [] + if not date_ref: + date_ref = fields.Date.context_today(self) + init_vals = invoices_values[0] + init_vals.update({"invoice_date": date_ref}) + for invoice_values in invoices_values[1:]: + # Merge invoice lines + for inv_line in invoice_values.get("invoice_line_ids", []): + init_vals.setdefault("invoice_line_ids", []) + # Ignore tuples that would empty the set of lines + if inv_line == Command.set([]): + continue + init_vals["invoice_line_ids"].append(inv_line) + # Merge origin + init_origin = init_vals.get("origin", "") + invoice_origin = invoice_values.get("origin") + if invoice_origin: + init_vals["origin"] = f"{init_origin}, {invoice_origin}" + # Merge reference + init_reference = init_vals.get("reference", "") + invoice_reference = invoice_values.get("reference") + if invoice_reference: + init_vals["reference"] = f"{init_reference}, {invoice_reference}" + # Theoretical invoice date: set only if same on all merged invoices + init_theoretical_date_invoice = init_vals.get("theoretical_date_invoice") + theoretical_date_invoice = invoice_values.get("theoretical_date_invoice") + if ( + init_theoretical_date_invoice + and init_theoretical_date_invoice != theoretical_date_invoice + ): + init_vals["theoretical_date_invoice"] = False + return init_vals + + def _get_grouped_invoice_vals(self, group_records, date_ref): + invoices_vals = [] + for model in group_records.values(): + invoices_vals += model._prepare_group_invoices_values(date_ref) + + final_invoice_vals = self._merge_invoices_values(invoices_vals, date_ref) + return final_invoice_vals + + def _post_create_group_invoices( + self, models: AccountMoveGroupMixin, moves: AccountMove + ): + for model in models: + model._hook_post_create_group_invoices(moves) + + def _create_grouped_invoice(self, group_records, date_ref): + invoices_vals = self._get_grouped_invoice_vals(group_records, date_ref) + invoices = self.env["account.move"].create(invoices_vals) + if invoices: + self._post_create_group_invoices(group_records.values(), invoices) + return invoices + + @api.model + def _cron_group_recurring_create_invoice(self, date_ref=None): + if not date_ref: + date_ref = fields.Date.context_today(self) + invoices = True + while invoices: + invoices = self.env["account.move"] + groups = self._get_groups_by_recordset(date_ref) + for group_records in groups.values(): + invoices |= self._create_grouped_invoice(group_records, date_ref) + + @api.model + def cron_group_recurring_create_invoice(self): + return self._cron_group_recurring_create_invoice() diff --git a/contract_sale_invoice_merge/models/account_move_group_mixin.py b/contract_sale_invoice_merge/models/account_move_group_mixin.py new file mode 100644 index 0000000000..37f065d568 --- /dev/null +++ b/contract_sale_invoice_merge/models/account_move_group_mixin.py @@ -0,0 +1,35 @@ +# Copyright 2026 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + +from odoo.addons.account.models.account_move import AccountMove + + +class AccountMoveGroupMixin(models.AbstractModel): + _name = "account.move.group.mixin" + _description = ( + "Interface for models that participate in account move grouped invoicing" + ) + + do_not_group_move = fields.Boolean( + string="Don't group this model in one invoice", + default=lambda self: self.env["res.config.settings"].do_not_group_move, + ) + + def _get_invoice_grouping_dict(self): + """Return grouping values.""" + return {} + + @api.model + def _get_group_invoice_domain(self, date_ref): + """Return the domain for records to invoice.""" + return [] + + def _prepare_group_invoices_values(self, date_ref): + """Return recurring invoice values.""" + raise NotImplementedError + + def _hook_post_create_group_invoices(self, moves: AccountMove): + """Hook right after the creation of grouped invoices.""" + return diff --git a/contract_sale_invoice_merge/models/contract.py b/contract_sale_invoice_merge/models/contract.py new file mode 100644 index 0000000000..a4692bba68 --- /dev/null +++ b/contract_sale_invoice_merge/models/contract.py @@ -0,0 +1,31 @@ +# Copyright 2026 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, models + + +class ContractContract(models.Model): + _name = "contract.contract" + _inherit = ["contract.contract", "account.move.group.mixin"] + + @api.model + def _get_invoice_grouping_dict(self): + self.ensure_one() + return { + "partner_invoice_id": self.invoice_partner_id.id, + "payment_term_id": self.payment_term_id.id, + "user_id": self.user_id.id, + "fiscal_position_id": self.fiscal_position_id.id, + "journal_id": self.journal_id.id, + } + + def _get_group_invoice_domain(self, date_ref): + return self._get_contracts_to_invoice_domain(date_ref) + + def _prepare_group_invoices_values(self, date_ref): + return self._prepare_recurring_invoices_values(date_ref) + + def _hook_post_create_group_invoices(self, moves): + self._add_contract_origin(moves) + self._invoice_followers(moves) + self._compute_recurring_next_date() diff --git a/contract_sale_invoice_merge/models/res_company.py b/contract_sale_invoice_merge/models/res_company.py new file mode 100644 index 0000000000..fa556551c5 --- /dev/null +++ b/contract_sale_invoice_merge/models/res_company.py @@ -0,0 +1,13 @@ +# Copyright 2026 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class ResCompany(models.Model): + _inherit = "res.company" + + do_not_group_move = fields.Boolean( + string="Do not group moves together", + default=False, + ) diff --git a/contract_sale_invoice_merge/models/res_config_settings.py b/contract_sale_invoice_merge/models/res_config_settings.py new file mode 100644 index 0000000000..a094d6cd23 --- /dev/null +++ b/contract_sale_invoice_merge/models/res_config_settings.py @@ -0,0 +1,14 @@ +# Copyright 2026 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class ResConfigSettings(models.TransientModel): + _inherit = "res.config.settings" + + do_not_group_move = fields.Boolean( + string="Do not group moves together", + related="company_id.do_not_group_move", + readonly=False, + ) diff --git a/contract_sale_invoice_merge/models/sale_order.py b/contract_sale_invoice_merge/models/sale_order.py new file mode 100644 index 0000000000..2f525876f5 --- /dev/null +++ b/contract_sale_invoice_merge/models/sale_order.py @@ -0,0 +1,42 @@ +# Copyright 2026 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import Command, api, models + + +class SaleOrder(models.Model): + _name = "sale.order" + _inherit = ["sale.order", "account.move.group.mixin"] + + @api.model + def _get_invoice_grouping_dict(self): + self.ensure_one() + return { + "partner_invoice_id": self.partner_invoice_id.id, + "payment_term_id": self.payment_term_id.id, + "user_id": self.user_id.id, + "fiscal_position_id": self.fiscal_position_id.id, + "journal_id": self.journal_id.id, + } + + @api.model + def _get_group_invoice_domain(self, date_ref): + return [("invoice_status", "=", "to invoice")] + + def _prepare_group_invoices_values(self, date_ref): + invoices_values = [] + for order in self: + invoice_vals = order._prepare_invoice() + + if not (order_lines := order._get_invoiceable_lines()): + continue + + invoice_line_vals = [] + for line in order_lines: + if invoice_line_vals := line._prepare_invoice_line(): + invoice_vals["invoice_line_ids"] += [ + Command.create(invoice_line_vals) + ] + + invoices_values += [invoice_vals] + return invoices_values diff --git a/contract_sale_invoice_merge/pyproject.toml b/contract_sale_invoice_merge/pyproject.toml new file mode 100644 index 0000000000..4231d0cccb --- /dev/null +++ b/contract_sale_invoice_merge/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/contract_sale_invoice_merge/readme/CONFIGURE.md b/contract_sale_invoice_merge/readme/CONFIGURE.md new file mode 100644 index 0000000000..8132894edf --- /dev/null +++ b/contract_sale_invoice_merge/readme/CONFIGURE.md @@ -0,0 +1 @@ +The field do_not_group_move allows to disable grouping of specific records. The default value can be configured in the config parameters. diff --git a/contract_sale_invoice_merge/readme/CONTRIBUTORS.md b/contract_sale_invoice_merge/readme/CONTRIBUTORS.md new file mode 100644 index 0000000000..7282e4db29 --- /dev/null +++ b/contract_sale_invoice_merge/readme/CONTRIBUTORS.md @@ -0,0 +1,2 @@ +- [Acsone SA/NV](https://www.acsone.eu): + - Alexis Anthonissen \<\> diff --git a/contract_sale_invoice_merge/readme/DESCRIPTION.md b/contract_sale_invoice_merge/readme/DESCRIPTION.md new file mode 100644 index 0000000000..1b5d16fca7 --- /dev/null +++ b/contract_sale_invoice_merge/readme/DESCRIPTION.md @@ -0,0 +1 @@ +Allows to group invoice lines in a minimal amount of invoices, whether they are generated from a Sale Order or from a Contract, according to grouping fields. diff --git a/contract_sale_invoice_merge/readme/ROADMAP.md b/contract_sale_invoice_merge/readme/ROADMAP.md new file mode 100644 index 0000000000..5f75da7b4f --- /dev/null +++ b/contract_sale_invoice_merge/readme/ROADMAP.md @@ -0,0 +1,2 @@ +- When a contract line is invoiced several times in a row, it still creates several invoices. An improvement could be to group these invoices together. +- Refactor the method _merge_invoices_values to allow flexible configuration of the merged fields. diff --git a/contract_sale_invoice_merge/readme/USAGE.md b/contract_sale_invoice_merge/readme/USAGE.md new file mode 100644 index 0000000000..cbb4c586bd --- /dev/null +++ b/contract_sale_invoice_merge/readme/USAGE.md @@ -0,0 +1,4 @@ +1. Create Sale Orders ready to be invoiced (confirmed). +2. Create Contracts ready to be invoiced (recurring_next_date <= today). +3. Run the contract_sale_invoice_merge_cron. +4. All invoices are created, and grouped according to the grouping fields. diff --git a/contract_sale_invoice_merge/security/ir.model.access.csv b/contract_sale_invoice_merge/security/ir.model.access.csv new file mode 100644 index 0000000000..9ee46455b7 --- /dev/null +++ b/contract_sale_invoice_merge/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +contract_sale_invoice_merge.access_account_move_group,access_account_move_group,contract_sale_invoice_merge.model_account_move_group,base.group_user,1,1,1,1 +contract_sale_invoice_merge.access_account_move_group_mixin,access_account_move_group_mixin,contract_sale_invoice_merge.model_account_move_group_mixin,base.group_user,1,1,1,1 diff --git a/contract_sale_invoice_merge/static/description/index.html b/contract_sale_invoice_merge/static/description/index.html new file mode 100644 index 0000000000..49ea6d9e86 --- /dev/null +++ b/contract_sale_invoice_merge/static/description/index.html @@ -0,0 +1,456 @@ + + + + + +Contract Sale Invoice Merge + + + +
+

Contract Sale Invoice Merge

+ + +

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

+

Allows to group invoice lines in a minimal amount of invoices, whether +they are generated from a Sale Order or from a Contract, according to +grouping fields.

+

Table of contents

+ +
+

Configuration

+

The field do_not_group_move allows to disable grouping of specific +records. The default value can be configured in the config parameters.

+
+
+

Usage

+
    +
  1. Create Sale Orders ready to be invoiced (confirmed).
    2. +
  2. Create Contracts ready to be invoiced (recurring_next_date <= today).
    3. +
  3. Run the contract_sale_invoice_merge_cron.
    4. +
  4. All invoices are created, and grouped according to the grouping +fields.
    5. +
+
+
+

Known issues / Roadmap

+
    +
  • When a contract line is invoiced several times in a row, it still +creates several invoices. An improvement could be to group these +invoices together.
    • +
  • Refactor the method _merge_invoices_values to allow flexible +configuration of the merged fields.
    • +
+
+
+

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

+
    +
  • ACSONE SA/NV
    • +
+
+
+

Contributors

+ +
+
+

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_sale_invoice_merge/tests/__init__.py b/contract_sale_invoice_merge/tests/__init__.py new file mode 100644 index 0000000000..13452e7479 --- /dev/null +++ b/contract_sale_invoice_merge/tests/__init__.py @@ -0,0 +1 @@ +from . import test_contract_sale_invoice_merge diff --git a/contract_sale_invoice_merge/tests/test_contract_sale_invoice_merge.py b/contract_sale_invoice_merge/tests/test_contract_sale_invoice_merge.py new file mode 100644 index 0000000000..cb5c563ac1 --- /dev/null +++ b/contract_sale_invoice_merge/tests/test_contract_sale_invoice_merge.py @@ -0,0 +1,292 @@ +# Copyright 2026 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from dateutil.relativedelta import relativedelta + +from odoo import fields +from odoo.tests import TransactionCase, tagged + + +@tagged("post_install", "-at_install") +class TestContractSaleInvoiceMerge(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env( + context=dict( + cls.env.context, + queue_job__no_delay=True, # no jobs thanks + ) + ) + + cls.cron = cls.env.ref( + "contract_sale_invoice_merge.contract_sale_invoice_merge_cron" + ) + cls.cron.method_direct_trigger() + + cls.today = fields.Date.today() + + cls.partner = cls.env["res.partner"].create({"name": "Partner"}) + cls.partner2 = cls.env["res.partner"].create({"name": "Partner2"}) + cls.product = cls.env["product.product"].create( + { + "name": "Product", + "list_price": 50.0, + } + ) + cls.product2 = cls.env["product.product"].create( + { + "name": "Product2", + "list_price": 75.0, + } + ) + cls.product3 = cls.env["product.product"].create( + { + "name": "Product3", + "list_price": 100.0, + } + ) + cls.contract_tmpl = cls.env["contract.template"].create({"name": "CT"}) + cls.product4 = cls.env["product.product"].create( + { + "name": "Product4", + "type": "service", + "list_price": 20.0, + "is_contract": True, + "recurrence_number": 6, + "property_contract_template_id": cls.contract_tmpl.id, + } + ) + cls.journal = cls.env["account.journal"].search([("code", "=", "INV")], limit=1) + cls.order = cls.env["sale.order"].create( + { + "name": "Sale Order", + "partner_id": cls.partner.id, + "partner_invoice_id": cls.partner.id, + "journal_id": cls.journal.id, + } + ) + cls.order2 = cls.env["sale.order"].create( + { + "name": "Sale Order 2", + "partner_id": cls.partner.id, + "partner_invoice_id": cls.partner.id, + "journal_id": cls.journal.id, + } + ) + cls.order_lines = cls.env["sale.order.line"].create( + [ + { + "order_id": cls.order.id, + "product_id": cls.product.id, + }, + { + "order_id": cls.order2.id, + "product_id": cls.product2.id, + }, + { + "order_id": cls.order2.id, + "product_id": cls.product3.id, + }, + ] + ) + + def _trigger_cron(self): + old_moves = self.env["account.move"].search([]) + self.cron.method_direct_trigger() + return self.env["account.move"].search([]) - old_moves + + def test_cron_exists(self): + self.assertTrue(self.cron.exists()) + + def test_cron_runs_on_empty(self): + move = self._trigger_cron() + self.assertFalse(move) + + def test_cron_invoices_single_order(self): + self.order.action_confirm() + self.assertEqual(self.order.invoice_status, "to invoice") + move = self._trigger_cron() + self.assertEqual(self.order.invoice_status, "invoiced") + self.assertEqual(len(move), 1) + self.assertAlmostEqual(move.amount_untaxed, 50) + move_line = move.invoice_line_ids + self.assertEqual(len(move_line), 1) + self.assertAlmostEqual(move_line.price_unit, 50) + self.assertEqual(move_line.sale_line_ids, self.order_lines[0]) + + def test_cron_invoices_multi_order_grouped(self): + self.order.action_confirm() + self.order2.action_confirm() + self.assertEqual(self.order.invoice_status, "to invoice") + self.assertEqual(self.order2.invoice_status, "to invoice") + move = self._trigger_cron() + self.assertEqual(self.order.invoice_status, "invoiced") + self.assertEqual(self.order2.invoice_status, "invoiced") + self.assertEqual(len(move), 1) + self.assertAlmostEqual(move.amount_untaxed, 225) + move_lines = move.invoice_line_ids + self.assertEqual(len(move_lines), 3) + self.assertEqual(move_lines.sale_line_ids, self.order_lines) + + def test_cron_invoices_multi_order_not_grouped(self): + # Cron should create 2 separate moves + self.order2.partner_invoice_id = self.partner2 + + self.order.action_confirm() + self.order2.action_confirm() + self.assertEqual(self.order.invoice_status, "to invoice") + self.assertEqual(self.order2.invoice_status, "to invoice") + moves = self._trigger_cron() + self.assertEqual(self.order.invoice_status, "invoiced") + self.assertEqual(self.order2.invoice_status, "invoiced") + self.assertEqual(len(moves), 2) + move1 = moves.filtered_domain( + [("invoice_line_ids.sale_line_ids", "=", self.order_lines[0].id)] + ) + move2 = moves - move1 + self.assertAlmostEqual(move1.amount_untaxed, 50) + self.assertEqual(len(move1.invoice_line_ids), 1) + self.assertEqual(move1.invoice_line_ids.sale_line_ids, self.order_lines[0]) + self.assertAlmostEqual(move2.amount_untaxed, 175) + self.assertEqual(len(move2.invoice_line_ids), 2) + self.assertEqual(move2.invoice_line_ids.sale_line_ids, self.order_lines[1:]) + + def test_cron_invoices_multi_order_do_not_group_move(self): + self.order2.do_not_group_move = True + + self.order.action_confirm() + self.order2.action_confirm() + self.assertEqual(self.order.invoice_status, "to invoice") + self.assertEqual(self.order2.invoice_status, "to invoice") + moves = self._trigger_cron() + self.assertEqual(self.order.invoice_status, "invoiced") + self.assertEqual(self.order2.invoice_status, "invoiced") + self.assertEqual(len(moves), 2) + move1 = moves.filtered_domain( + [("invoice_line_ids.sale_line_ids", "=", self.order_lines[0].id)] + ) + move2 = moves - move1 + self.assertAlmostEqual(move1.amount_untaxed, 50) + self.assertEqual(len(move1.invoice_line_ids), 1) + self.assertEqual(move1.invoice_line_ids.sale_line_ids, self.order_lines[0]) + self.assertAlmostEqual(move2.amount_untaxed, 175) + self.assertEqual(len(move2.invoice_line_ids), 2) + self.assertEqual(move2.invoice_line_ids.sale_line_ids, self.order_lines[1:]) + + def test_cron_invoices_single_contract(self): + contract = self.env["contract.contract"].create( + { + "name": "Contract", + "partner_id": self.partner.id, + } + ) + contract_line = self.env["contract.line"].create( + { + "name": "Contract Line", + "contract_id": contract.id, + "product_id": self.product4.id, + } + ) + move = self._trigger_cron() + self.assertEqual(len(move), 1) + self.assertEqual(move.invoice_line_ids.contract_line_id, contract_line) + + def test_cron_invoices_single_contract_recurring(self): + contract = self.env["contract.contract"].create( + { + "name": "Contract", + "partner_id": self.partner.id, + } + ) + contract_line = self.env["contract.line"].create( + { + "name": "Contract Line", + "contract_id": contract.id, + "product_id": self.product4.id, + "date_start": self.today - relativedelta(months=2), + } + ) + moves = self._trigger_cron() + self.assertEqual(len(moves), 3) + self.assertEqual(moves.invoice_line_ids.contract_line_id, contract_line) + + def test_cron_invoices_multi_contract_recurring(self): + contracts = self.env["contract.contract"].create( + [ + { + "name": "Contract", + "partner_id": self.partner.id, + }, + { + "name": "Contract 2", + "partner_id": self.partner.id, + }, + ] + ) + contract_lines = self.env["contract.line"].create( + [ + { + "name": "Contract Line", + "contract_id": contracts[0].id, + "product_id": self.product4.id, + }, + { + "name": "Contract Line 2", + "contract_id": contracts[0].id, + "product_id": self.product4.id, + "date_start": self.today - relativedelta(months=2), + }, + { + "name": "Contract 2 Line", + "contract_id": contracts[1].id, + "product_id": self.product4.id, + "date_start": self.today - relativedelta(months=1), + }, + ] + ) + + moves = self._trigger_cron() + self.assertEqual(len(moves), 3) + self.assertEqual(moves.invoice_line_ids.contract_line_id, contract_lines) + move1 = moves.filtered( + lambda s: contract_lines[0] in s.invoice_line_ids.contract_line_id + ) + self.assertEqual(len(move1), 1) + self.assertEqual(len(move1.invoice_line_ids), 3) + self.assertEqual(move1.invoice_line_ids.contract_line_id, contract_lines) + moves_CL2 = moves.filtered( + lambda s: contract_lines[1] in s.invoice_line_ids.contract_line_id + ) + self.assertEqual(len(moves_CL2), 3) + moves_CL3 = moves.filtered( + lambda s: contract_lines[2] in s.invoice_line_ids.contract_line_id + ) + self.assertEqual(len(moves_CL3), 2) + move2 = moves_CL3 - move1 + self.assertEqual(len(move2), 1) + self.assertEqual(len(move2.invoice_line_ids), 2) + self.assertEqual(move2.invoice_line_ids.contract_line_id, contract_lines[1:]) + + def test_cron_invoices_order_and_contract_grouped(self): + order_line_contract = self.env["sale.order.line"].create( + { + "order_id": self.order.id, + "product_id": self.product4.id, + } + ) + self.order.action_confirm() + self.assertEqual(self.order.invoice_status, "to invoice") + move = self._trigger_cron() + self.assertEqual(self.order.invoice_status, "no") + self.assertEqual(len(move), 1) + self.assertAlmostEqual(move.amount_untaxed, 70) + move_lines = move.invoice_line_ids + self.assertEqual(len(move_lines), 2) + contract_move_line = move_lines.filtered(lambda s: s.contract_line_id) + self.assertEqual(len(contract_move_line), 1) + self.assertAlmostEqual(contract_move_line.price_unit, 20) + self.assertEqual(contract_move_line.sale_line_ids, order_line_contract) + order_move_line = move_lines - contract_move_line + self.assertAlmostEqual(order_move_line.price_unit, 50) + self.assertEqual(order_move_line.sale_line_ids, self.order_lines[0]) diff --git a/contract_sale_invoice_merge/views/contract_contract.xml b/contract_sale_invoice_merge/views/contract_contract.xml new file mode 100644 index 0000000000..38d57a226c --- /dev/null +++ b/contract_sale_invoice_merge/views/contract_contract.xml @@ -0,0 +1,18 @@ + + + + + contract.contract + + + + + + + + diff --git a/contract_sale_invoice_merge/views/res_config_settings.xml b/contract_sale_invoice_merge/views/res_config_settings.xml new file mode 100644 index 0000000000..4f12bb6b33 --- /dev/null +++ b/contract_sale_invoice_merge/views/res_config_settings.xml @@ -0,0 +1,21 @@ + + + + + res.config.settings + + + +
+
+ +
+
+
+
+ + + +