From 928ec712401def480d1f3e95dc1bb6e6b987658b Mon Sep 17 00:00:00 2001
From: Enric Tobella <etobella@creublanca.es>
Date: Wed, 11 Oct 2023 11:30:10 +0200
Subject: [PATCH 1/4] [IMP] contract: Allow to single invoice a contract by
 users in a more controlled way

It should allow you to process sale orders and other kinds
Remove the extra button not necessary any more
---
 contract/__manifest__.py                      |   1 +
 contract/models/contract.py                   |  20 ++-
 contract/readme/CONTRIBUTORS.rst              |   3 +
 contract/security/ir.model.access.csv         |   1 +
 contract/tests/test_contract.py               | 151 +++++++++++++-----
 .../test_contract_manually_create_invoice.py  |  25 +++
 contract/views/contract.xml                   |  10 +-
 contract/wizards/__init__.py                  |   1 +
 .../contract_manually_single_invoice.py       |  42 +++++
 .../contract_manually_single_invoice.xml      |  41 +++++
 10 files changed, 249 insertions(+), 46 deletions(-)
 create mode 100644 contract/wizards/contract_manually_single_invoice.py
 create mode 100644 contract/wizards/contract_manually_single_invoice.xml

diff --git a/contract/__manifest__.py b/contract/__manifest__.py
index a32ca9f23e..93163ce817 100644
--- a/contract/__manifest__.py
+++ b/contract/__manifest__.py
@@ -35,6 +35,7 @@
         "wizards/contract_line_wizard.xml",
         "wizards/contract_manually_create_invoice.xml",
         "wizards/contract_contract_terminate.xml",
+        "wizards/contract_manually_single_invoice.xml",
         "views/contract_tag.xml",
         "views/account_move_views.xml",
         "views/assets.xml",
diff --git a/contract/models/contract.py b/contract/models/contract.py
index 520684ed67..2c2fd85af8 100644
--- a/contract/models/contract.py
+++ b/contract/models/contract.py
@@ -574,6 +574,10 @@ def recurring_create_invoice(self):
         This method triggers the creation of the next invoices of the contracts
         even if their next invoicing date is in the future.
         """
+        _logger.warning(
+            "recurring_create_invoice is deprecated in favor of "
+            "_recurring_create_invoice instead"
+        )
         invoices = self._recurring_create_invoice()
         for invoice in invoices:
             self.message_post(
@@ -633,17 +637,24 @@ def _get_recurring_create_func(self, create_type="invoice"):
             return self.__class__._recurring_create_invoice
 
     @api.model
-    def _cron_recurring_create(self, date_ref=False, create_type="invoice"):
+    def _cron_recurring_create(
+        self, date_ref=False, create_type="invoice", domain=None
+    ):
         """
         The cron function in order to create recurrent documents
         from contracts.
+        The domain is used to add an extra filter
         """
+        if domain is None:
+            domain = []
         _recurring_create_func = self._get_recurring_create_func(
             create_type=create_type
         )
         if not date_ref:
             date_ref = fields.Date.context_today(self)
-        domain = self._get_contracts_to_invoice_domain(date_ref)
+        domain = expression.AND(
+            [domain, self._get_contracts_to_invoice_domain(date_ref)]
+        )
         domain = expression.AND(
             [
                 domain,
@@ -652,14 +663,15 @@ def _cron_recurring_create(self, date_ref=False, create_type="invoice"):
         )
         contracts = self.search(domain)
         companies = set(contracts.mapped("company_id"))
+        result = []
         # Invoice by companies, so assignation emails get correct context
         for company in companies:
             contracts_to_invoice = contracts.filtered(
                 lambda c: c.company_id == company
                 and (not c.date_end or c.recurring_next_date <= c.date_end)
             ).with_company(company)
-            _recurring_create_func(contracts_to_invoice, date_ref)
-        return True
+            result.append(_recurring_create_func(contracts_to_invoice, date_ref))
+        return result
 
     @api.model
     def cron_recurring_create_invoice(self, date_ref=None):
diff --git a/contract/readme/CONTRIBUTORS.rst b/contract/readme/CONTRIBUTORS.rst
index 1d303c64da..c4b14576ae 100644
--- a/contract/readme/CONTRIBUTORS.rst
+++ b/contract/readme/CONTRIBUTORS.rst
@@ -15,3 +15,6 @@
     * Víctor Martínez
 * Iván Antón <ozono@ozonomultimedia.com>
 * Eric Antones <eantones@nuobit.com>
+* `Dixmit <https://www.dixmit.com>`_:
+
+    * Enric Tobella
diff --git a/contract/security/ir.model.access.csv b/contract/security/ir.model.access.csv
index 63b7beaf76..2707753629 100644
--- a/contract/security/ir.model.access.csv
+++ b/contract/security/ir.model.access.csv
@@ -14,3 +14,4 @@
 "contract_line_wizard","contract_line_wizard","model_contract_line_wizard","account.group_account_manager",1,1,1,1
 "contract_manually_create_invoice_wizard","contract_manually_create_invoice_wizard","model_contract_manually_create_invoice","account.group_account_invoice",1,1,1,1
 "contract_contract_terminate_wizard","contract_contract_terminate_wizard","model_contract_contract_terminate","contract.can_terminate_contract",1,1,1,1
+"contract_manually_single_invoice_wizard","contract_manually_single_process_wizard","model_contract_manually_single_invoice","account.group_account_invoice",1,1,1,1
diff --git a/contract/tests/test_contract.py b/contract/tests/test_contract.py
index 5ea558f0c7..7fe653fa25 100644
--- a/contract/tests/test_contract.py
+++ b/contract/tests/test_contract.py
@@ -279,7 +279,9 @@ def test_contract(self):
         self.acct_line._onchange_product_id()
         self.acct_line.price_unit = 100.0
         self.contract.partner_id = self.partner.id
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         self.invoice_monthly = self.contract._get_related_invoices()
         self.assertTrue(self.invoice_monthly)
         self.assertEqual(self.acct_line.recurring_next_date, to_date("2018-02-15"))
@@ -298,7 +300,9 @@ def test_contract_daily(self):
         self.acct_line.recurring_next_date = "2018-02-22"
         self.acct_line.recurring_rule_type = "daily"
         self.contract.pricelist_id = False
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         invoice_daily = self.contract._get_related_invoices()
         self.assertTrue(invoice_daily)
         self.assertEqual(self.acct_line.recurring_next_date, recurring_next_date)
@@ -317,7 +321,9 @@ def test_contract_invoice_followers(self):
         self.contract.message_subscribe(
             partner_ids=self.contract.partner_id.ids, subtype_ids=subtype_ids
         )
-        self.contract._recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         invoice_daily = self.contract._get_related_invoices()
         self.assertTrue(invoice_daily)
         self.assertTrue(self.contract.partner_id in invoice_daily.message_partner_ids)
@@ -329,7 +335,9 @@ def test_contract_invoice_salesperson(self):
             {"name": "Some Salesperson", "login": "salesperson_test"}
         )
         self.contract.user_id = new_salesperson
-        self.contract._recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         invoice_daily = self.contract._get_related_invoices()
         self.assertTrue(invoice_daily)
         self.assertEqual(self.contract.user_id, invoice_daily.user_id)
@@ -341,7 +349,9 @@ def test_contract_weekly_post_paid(self):
         self.acct_line.recurring_next_date = "2018-02-22"
         self.acct_line.recurring_rule_type = "weekly"
         self.acct_line.recurring_invoicing_type = "post-paid"
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         invoices_weekly = self.contract._get_related_invoices()
         self.assertTrue(invoices_weekly)
         self.assertEqual(self.acct_line.recurring_next_date, recurring_next_date)
@@ -353,7 +363,9 @@ def test_contract_weekly_pre_paid(self):
         self.acct_line.recurring_next_date = "2018-02-22"
         self.acct_line.recurring_rule_type = "weekly"
         self.acct_line.recurring_invoicing_type = "pre-paid"
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         invoices_weekly = self.contract._get_related_invoices()
         self.assertTrue(invoices_weekly)
         self.assertEqual(self.acct_line.recurring_next_date, recurring_next_date)
@@ -365,7 +377,9 @@ def test_contract_yearly_post_paid(self):
         self.acct_line.recurring_next_date = "2018-02-22"
         self.acct_line.recurring_rule_type = "yearly"
         self.acct_line.recurring_invoicing_type = "post-paid"
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         invoices_weekly = self.contract._get_related_invoices()
         self.assertTrue(invoices_weekly)
         self.assertEqual(self.acct_line.recurring_next_date, recurring_next_date)
@@ -378,7 +392,9 @@ def test_contract_yearly_pre_paid(self):
         self.acct_line.recurring_next_date = "2018-02-22"
         self.acct_line.recurring_rule_type = "yearly"
         self.acct_line.recurring_invoicing_type = "pre-paid"
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         invoices_weekly = self.contract._get_related_invoices()
         self.assertTrue(invoices_weekly)
         self.assertEqual(self.acct_line.recurring_next_date, recurring_next_date)
@@ -390,7 +406,9 @@ def test_contract_monthly_lastday(self):
         self.acct_line.recurring_next_date = "2018-02-22"
         self.acct_line.recurring_invoicing_type = "post-paid"
         self.acct_line.recurring_rule_type = "monthlylastday"
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         invoices_monthly_lastday = self.contract._get_related_invoices()
         self.assertTrue(invoices_monthly_lastday)
         self.assertEqual(self.acct_line.recurring_next_date, recurring_next_date)
@@ -403,7 +421,9 @@ def test_contract_quarterly_pre_paid(self):
         self.acct_line.recurring_next_date = "2018-02-22"
         self.acct_line.recurring_rule_type = "quarterly"
         self.acct_line.recurring_invoicing_type = "pre-paid"
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         invoices_weekly = self.contract._get_related_invoices()
         self.assertTrue(invoices_weekly)
         self.assertEqual(self.acct_line.recurring_next_date, recurring_next_date)
@@ -416,7 +436,9 @@ def test_contract_quarterly_post_paid(self):
         self.acct_line.recurring_next_date = "2018-02-22"
         self.acct_line.recurring_rule_type = "quarterly"
         self.acct_line.recurring_invoicing_type = "post-paid"
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         invoices_weekly = self.contract._get_related_invoices()
         self.assertTrue(invoices_weekly)
         self.assertEqual(self.acct_line.recurring_next_date, recurring_next_date)
@@ -429,7 +451,9 @@ def test_contract_semesterly_pre_paid(self):
         self.acct_line.recurring_next_date = "2018-02-22"
         self.acct_line.recurring_rule_type = "semesterly"
         self.acct_line.recurring_invoicing_type = "pre-paid"
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         invoices_weekly = self.contract._get_related_invoices()
         self.assertTrue(invoices_weekly)
         self.assertEqual(self.acct_line.recurring_next_date, recurring_next_date)
@@ -442,7 +466,9 @@ def test_contract_semesterly_post_paid(self):
         self.acct_line.recurring_next_date = "2018-02-22"
         self.acct_line.recurring_rule_type = "semesterly"
         self.acct_line.recurring_invoicing_type = "post-paid"
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         invoices_weekly = self.contract._get_related_invoices()
         self.assertTrue(invoices_weekly)
         self.assertEqual(self.acct_line.recurring_next_date, recurring_next_date)
@@ -481,13 +507,19 @@ def test_last_invoice_pre_paid(self):
         self.assertTrue(self.acct_line.create_invoice_visibility)
         self.assertEqual(self.acct_line.recurring_next_date, to_date("2018-01-01"))
         self.assertFalse(self.acct_line.last_date_invoiced)
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         self.assertEqual(self.acct_line.recurring_next_date, to_date("2018-02-01"))
         self.assertEqual(self.acct_line.last_date_invoiced, to_date("2018-01-31"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         self.assertEqual(self.acct_line.last_date_invoiced, to_date("2018-02-28"))
         self.assertEqual(self.acct_line.last_date_invoiced, to_date("2018-02-28"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         self.assertEqual(self.acct_line.last_date_invoiced, to_date("2018-03-15"))
         self.assertFalse(self.acct_line.recurring_next_date)
         self.assertFalse(self.acct_line.create_invoice_visibility)
@@ -541,7 +573,12 @@ def test_check_journal(self):
         journal = self.env["account.journal"].search([("type", "=", "sale")])
         journal.write({"type": "general"})
         with self.assertRaises(ValidationError):
-            self.contract.recurring_create_invoice()
+            self.env["contract.manually.single.invoice"].create(
+                {
+                    "date": self.contract.recurring_next_date,
+                    "contract_id": self.contract.id,
+                }
+            ).create_invoice()
 
     def test_check_date_end(self):
         with self.assertRaises(ValidationError):
@@ -1132,7 +1169,9 @@ def _error_message(
 
     def test_recurring_next_date(self):
         """recurring next date for a contract is the min for all lines"""
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         self.assertEqual(
             self.contract.recurring_next_date,
             min(self.contract.contract_line_ids.mapped("recurring_next_date")),
@@ -1788,14 +1827,18 @@ def test_get_period_to_invoice_monthlylastday_postpaid(self):
         )
         self.assertEqual(first, to_date("2018-01-05"))
         self.assertEqual(last, to_date("2018-01-31"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
         )
         self.assertEqual(first, to_date("2018-02-01"))
         self.assertEqual(last, to_date("2018-02-28"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
@@ -1817,7 +1860,9 @@ def test_get_period_to_invoice_monthlylastday_prepaid(self):
         self.assertEqual(last, to_date("2018-01-31"))
         self.assertEqual(recurring_next_date, to_date("2018-01-05"))
         self.assertEqual(self.acct_line.recurring_next_date, to_date("2018-01-05"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
@@ -1827,7 +1872,9 @@ def test_get_period_to_invoice_monthlylastday_prepaid(self):
         self.assertEqual(recurring_next_date, to_date("2018-02-01"))
         self.assertEqual(self.acct_line.recurring_next_date, to_date("2018-02-01"))
         self.assertEqual(self.acct_line.last_date_invoiced, to_date("2018-01-31"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
@@ -1837,7 +1884,9 @@ def test_get_period_to_invoice_monthlylastday_prepaid(self):
         self.assertEqual(recurring_next_date, to_date("2018-03-01"))
         self.assertEqual(self.acct_line.recurring_next_date, to_date("2018-03-01"))
         self.assertEqual(self.acct_line.last_date_invoiced, to_date("2018-02-28"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
@@ -1873,7 +1922,9 @@ def test_get_period_to_invoice_monthly_post_paid_2(self):
         self.acct_line.recurring_invoicing_type = "post-paid"
         self.acct_line.recurring_rule_type = "monthly"
         self.acct_line.date_end = "2018-08-15"
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
@@ -1899,14 +1950,18 @@ def test_get_period_to_invoice_monthly_post_paid(self):
         )
         self.assertEqual(first, to_date("2018-01-05"))
         self.assertEqual(last, to_date("2018-02-04"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
         )
         self.assertEqual(first, to_date("2018-02-05"))
         self.assertEqual(last, to_date("2018-03-04"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
@@ -1925,14 +1980,18 @@ def test_get_period_to_invoice_monthly_pre_paid(self):
         )
         self.assertEqual(first, to_date("2018-01-05"))
         self.assertEqual(last, to_date("2018-02-04"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
         )
         self.assertEqual(first, to_date("2018-02-05"))
         self.assertEqual(last, to_date("2018-03-04"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
@@ -1951,14 +2010,18 @@ def test_get_period_to_invoice_yearly_post_paid(self):
         )
         self.assertEqual(first, to_date("2018-01-05"))
         self.assertEqual(last, to_date("2019-01-04"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
         )
         self.assertEqual(first, to_date("2019-01-05"))
         self.assertEqual(last, to_date("2020-01-04"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
@@ -1977,14 +2040,18 @@ def test_get_period_to_invoice_yearly_pre_paid(self):
         )
         self.assertEqual(first, to_date("2018-01-05"))
         self.assertEqual(last, to_date("2019-01-04"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
         )
         self.assertEqual(first, to_date("2019-01-05"))
         self.assertEqual(last, to_date("2020-01-04"))
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         first, last, recurring_next_date = self.acct_line._get_period_to_invoice(
             self.acct_line.last_date_invoiced,
             self.acct_line.recurring_next_date,
@@ -2239,9 +2306,15 @@ def test_sale_fields_view_get(self):
         self.assertEqual(view["view_id"], sale_form_view.id)
 
     def test_contract_count_invoice(self):
-        self.contract.recurring_create_invoice()
-        self.contract.recurring_create_invoice()
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         self.contract._compute_invoice_count()
         self.assertEqual(self.contract.invoice_count, 3)
 
@@ -2280,7 +2353,9 @@ def test_invoice_contract_without_lines(self):
         self.assertFalse(self.contract.recurring_create_invoice())
 
     def test_stop_at_last_date_invoiced(self):
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         self.assertTrue(self.acct_line.recurring_next_date)
         self.acct_line.stop(self.acct_line.last_date_invoiced)
         self.assertFalse(self.acct_line.recurring_next_date)
@@ -2373,7 +2448,9 @@ def test_action_terminate_contract_check_recurring_dates(self):
         self.assertFalse(self.contract3.recurring_next_date)
 
     def test_terminate_date_before_last_date_invoiced(self):
-        self.contract.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         self.assertEqual(self.acct_line.last_date_invoiced, to_date("2018-02-14"))
         group_can_terminate_contract = self.env.ref("contract.can_terminate_contract")
         group_can_terminate_contract.users |= self.env.user
diff --git a/contract/tests/test_contract_manually_create_invoice.py b/contract/tests/test_contract_manually_create_invoice.py
index fb13bdd4a9..7f403e8168 100644
--- a/contract/tests/test_contract_manually_create_invoice.py
+++ b/contract/tests/test_contract_manually_create_invoice.py
@@ -48,6 +48,31 @@ def test_contract_manually_create_invoice(self):
         self.assertFalse(invoice_lines.mapped("move_id") - invoices)
         self.assertEqual(len(invoices), contract_to_invoice_count)
 
+    def test_contract_manually_single_contract(self):
+        contracts = self.env["contract.contract"]
+        for _i in range(10):
+            contracts |= self.contract.copy()
+        wizard = self.env["contract.manually.single.invoice"].create(
+            {"date": self.today, "contract_id": self.contract.id}
+        )
+        wizard.create_invoice()
+        invoice_lines = self.env["account.move.line"].search(
+            [("contract_line_id", "in", contracts.mapped("contract_line_ids").ids)]
+        )
+        self.assertEqual(
+            0,
+            len(invoice_lines),
+        )
+        invoice_lines = self.env["account.move.line"].search(
+            [("contract_line_id", "in", self.contract.mapped("contract_line_ids").ids)]
+        )
+        self.assertEqual(
+            2,
+            len(invoice_lines),
+        )
+        # Two invoices are available from to 2018-1-1 2018-3-15.
+        # We are invoicing at the end of the month
+
     def test_contract_manually_create_invoice_with_usererror(self):
 
         contracts = self.contract
diff --git a/contract/views/contract.xml b/contract/views/contract.xml
index 1e9ddebe04..3e0b2a764a 100644
--- a/contract/views/contract.xml
+++ b/contract/views/contract.xml
@@ -38,11 +38,11 @@
                         groups="base.group_user"
                     />
                     <button
-                        name="recurring_create_invoice"
-                        type="object"
-                        attrs="{'invisible': ['|', ('create_invoice_visibility', '=', False),('generation_type','!=','invoice')]}"
-                        string="Create invoices"
-                        groups="base.group_no_one"
+                        name="%(contract.contract_manually_single_invoice_act_window)s"
+                        type="action"
+                        string="Process manually"
+                        context="{'default_contract_id': id, 'default_date': recurring_next_date}"
+                        attrs="{'invisible': [('id', '=', False)]}"
                     />
                     <button
                         name="action_terminate_contract"
diff --git a/contract/wizards/__init__.py b/contract/wizards/__init__.py
index 32e54545de..568f8237a2 100644
--- a/contract/wizards/__init__.py
+++ b/contract/wizards/__init__.py
@@ -1,3 +1,4 @@
 from . import contract_line_wizard
 from . import contract_manually_create_invoice
 from . import contract_contract_terminate
+from . import contract_manually_single_invoice
diff --git a/contract/wizards/contract_manually_single_invoice.py b/contract/wizards/contract_manually_single_invoice.py
new file mode 100644
index 0000000000..530dcaa236
--- /dev/null
+++ b/contract/wizards/contract_manually_single_invoice.py
@@ -0,0 +1,42 @@
+# Copyright 2023 Dixmit
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import _, fields, models
+
+
+class ContractManuallySingleInvoice(models.TransientModel):
+    _name = "contract.manually.single.invoice"
+    _description = "Manually invoice a single contract"
+
+    contract_id = fields.Many2one("contract.contract", required=True)
+    date = fields.Date(required=True, default=lambda r: fields.Date.today())
+
+    def create_invoice(self):
+        while (
+            self.contract_id.recurring_next_date
+            and self.contract_id.recurring_next_date <= self.date
+            and (
+                not self.contract_id.date_end
+                or self.contract_id.recurring_next_date <= self.contract_id.date_end
+            )
+        ):
+            result = (
+                self.env["contract.contract"]
+                .with_company(self.contract_id.company_id.id)
+                ._cron_recurring_create(
+                    self.contract_id.recurring_next_date,
+                    create_type=self.contract_id.generation_type,
+                    domain=[("id", "=", self.contract_id.id)],
+                )
+            )
+            for record in result:
+                self.contract_id.message_post(
+                    body=_(
+                        "Contract manually generated: "
+                        '<a href="#" data-oe-model="%s" data-oe-id="%s">'
+                        "%s"
+                        "</a>"
+                    )
+                    % (record._name, record.id, record.display_name)
+                )
+        return True
diff --git a/contract/wizards/contract_manually_single_invoice.xml b/contract/wizards/contract_manually_single_invoice.xml
new file mode 100644
index 0000000000..b13bb749a1
--- /dev/null
+++ b/contract/wizards/contract_manually_single_invoice.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2023 Dixmit
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record model="ir.ui.view" id="contract_manually_single_invoice_form_view">
+        <field name="name">contract.manually.single.invoice.form (in contract)</field>
+        <field name="model">contract.manually.single.invoice</field>
+        <field name="arch" type="xml">
+            <form string="Contract Manually Single Invoice">
+                <!-- TODO -->
+                <group>
+                    <field name="contract_id" invisible="1" />
+                    <field name="date" />
+                </group>
+                <footer>
+                    <button
+                        name="create_invoice"
+                        string="Generate invoices"
+                        class="btn-primary"
+                        type="object"
+                    />
+                    <button string="Cancel" class="btn-default" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record
+        model="ir.actions.act_window"
+        id="contract_manually_single_invoice_act_window"
+    >
+        <field name="name">Process Contract Manually</field> <!-- TODO -->
+        <field name="res_model">contract.manually.single.invoice</field>
+        <field name="view_mode">form</field>
+        <field name="context">{}</field>
+        <field name="target">new</field>
+    </record>
+
+
+</odoo>

From 5086087e0f3acdd622f3e758ba2671b625460cb2 Mon Sep 17 00:00:00 2001
From: Enric Tobella <etobella@creublanca.es>
Date: Fri, 13 Oct 2023 14:19:26 +0200
Subject: [PATCH 2/4] [FIX] contract_sale_generation

---
 contract_sale_generation/models/contract.py   |  8 ++++
 .../tests/test_contract_sale.py               | 46 ++++++++++++++-----
 .../tests/test_contract_sale_recurrency.py    |  9 ++--
 contract_sale_generation/views/contract.xml   | 10 ----
 4 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/contract_sale_generation/models/contract.py b/contract_sale_generation/models/contract.py
index f15d2a694f..123212fdcc 100644
--- a/contract_sale_generation/models/contract.py
+++ b/contract_sale_generation/models/contract.py
@@ -8,8 +8,12 @@
 # Copyright 2018 Therp BV <https://therp.nl>.
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
+import logging
+
 from odoo import _, api, fields, models
 
+_logger = logging.getLogger(__name__)
+
 
 class ContractContract(models.Model):
     _inherit = "contract.contract"
@@ -70,6 +74,10 @@ def recurring_create_sale(self):
         This method triggers the creation of the next sale order of the
         contracts even if their next sale order date is in the future.
         """
+        _logger.warning(
+            "recurring_create_invoice is deprecated in favor of "
+            "_recurring_create_invoice instead"
+        )
         sales = self._recurring_create_sale()
         for sale_rec in sales:
             self.message_post(
diff --git a/contract_sale_generation/tests/test_contract_sale.py b/contract_sale_generation/tests/test_contract_sale.py
index 51ae1ee90f..139f638eb2 100644
--- a/contract_sale_generation/tests/test_contract_sale.py
+++ b/contract_sale_generation/tests/test_contract_sale.py
@@ -15,6 +15,11 @@ def to_date(date):
 
 
 class TestContractSale(ContractSaleCommon, SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.contract.generation_type = "sale"
+
     def test_check_discount(self):
         with self.assertRaises(ValidationError):
             self.contract_line.write({"discount": 120})
@@ -24,7 +29,9 @@ def test_contract(self):
         self.assertAlmostEqual(self.contract_line.price_subtotal, 50.0)
         self.contract_line.price_unit = 100.0
         self.contract.partner_id = self.partner.id
-        self.contract.recurring_create_sale()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         self.sale_monthly = self.contract._get_related_sales()
         self.assertTrue(self.sale_monthly)
         self.assertEqual(self.contract_line.recurring_next_date, recurring_next_date)
@@ -39,7 +46,9 @@ def test_contract_autoconfirm(self):
         self.assertAlmostEqual(self.contract_line.price_subtotal, 50.0)
         self.contract_line.price_unit = 100.0
         self.contract.partner_id = self.partner.id
-        self.contract.recurring_create_sale()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         self.sale_monthly = self.contract._get_related_sales()
         self.assertTrue(self.sale_monthly)
         self.assertEqual(self.contract_line.recurring_next_date, recurring_next_date)
@@ -77,19 +86,30 @@ def test_onchange_contract_template_id(self):
         self.assertDictEqual(res, self.template_vals)
 
     def test_contract_count_sale(self):
-        self.contract.recurring_create_sale()
-        self.contract.recurring_create_sale()
-        self.contract.recurring_create_sale()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         self.contract._compute_sale_count()
         self.assertEqual(self.contract.sale_count, 3)
 
     def test_contract_count_sale_2(self):
-        orders = self.env["sale.order"]
-        orders |= self.contract.recurring_create_sale()
-        orders |= self.contract.recurring_create_sale()
-        orders |= self.contract.recurring_create_sale()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         action = self.contract.action_show_sales()
-        self.assertEqual(set(action["domain"][0][2]), set(orders.ids))
+        self.assertEqual(len(self.env[action["res_model"]].search(action["domain"])), 3)
 
     def test_cron_recurring_create_sale(self):
         self.contract_line.date_start = "2020-01-01"
@@ -109,6 +129,8 @@ def test_cron_recurring_create_sale(self):
         )
 
     def test_contract_sale_analytic(self):
-        orders = self.env["sale.order"].browse()
-        orders |= self.contract.recurring_create_sale()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
+        orders = self.contract._get_related_sales()
         self.assertEqual(self.analytic_account, orders.mapped("analytic_account_id"))
diff --git a/contract_sale_generation/tests/test_contract_sale_recurrency.py b/contract_sale_generation/tests/test_contract_sale_recurrency.py
index 63ffd539b5..950cac53f0 100644
--- a/contract_sale_generation/tests/test_contract_sale_recurrency.py
+++ b/contract_sale_generation/tests/test_contract_sale_recurrency.py
@@ -67,12 +67,15 @@ def test_contract_next_date(self):
         self.assertEqual(
             fields.Date.to_date("2020-01-15"), self.contract.recurring_next_date
         )
-
-        self.contract.recurring_create_sale()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         self.assertEqual(
             fields.Date.to_date("2020-01-22"), self.contract.recurring_next_date
         )
-        self.contract.recurring_create_sale()
+        self.env["contract.manually.single.invoice"].create(
+            {"date": self.contract.recurring_next_date, "contract_id": self.contract.id}
+        ).create_invoice()
         self.assertEqual(
             fields.Date.to_date("2020-01-29"), self.contract.recurring_next_date
         )
diff --git a/contract_sale_generation/views/contract.xml b/contract_sale_generation/views/contract.xml
index 02e0468090..e2597ff213 100644
--- a/contract_sale_generation/views/contract.xml
+++ b/contract_sale_generation/views/contract.xml
@@ -10,16 +10,6 @@
                     name="sale_autoconfirm"
                 />
             </xpath>
-            <xpath expr="//button[@name='recurring_create_invoice']" position="before">
-                <button
-                    attrs="{'invisible': [('generation_type','!=','sale')]}"
-                    class="oe_link"
-                    groups="base.group_no_one"
-                    name="recurring_create_sale"
-                    string="CREATE SALES"
-                    type="object"
-                />
-            </xpath>
             <xpath expr="//button[@name='action_show_invoices']" position="after">
                 <button
                     attrs="{'invisible': [('generation_type','!=','sale')]}"

From af58549d4232456c8b03ca94982b0388fbd96755 Mon Sep 17 00:00:00 2001
From: Damien Crier <damien.crier@foodles.co>
Date: Fri, 3 Nov 2023 16:02:56 +0100
Subject: [PATCH 3/4] [FIX] contract: Fix looping on manually single invoice
 wizard

if the method creating invoice generates more than one invoice, we have
`[account.move(ID1, ID2)` for example and the `message_post()` fails w/ a `singleton error.

Adding a loop level allows to properly post messages no matter of the number of invoices generated by the wizard
---
 .../contract_manually_single_invoice.py       | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/contract/wizards/contract_manually_single_invoice.py b/contract/wizards/contract_manually_single_invoice.py
index 530dcaa236..b6793f9c11 100644
--- a/contract/wizards/contract_manually_single_invoice.py
+++ b/contract/wizards/contract_manually_single_invoice.py
@@ -29,14 +29,15 @@ def create_invoice(self):
                     domain=[("id", "=", self.contract_id.id)],
                 )
             )
-            for record in result:
-                self.contract_id.message_post(
-                    body=_(
-                        "Contract manually generated: "
-                        '<a href="#" data-oe-model="%s" data-oe-id="%s">'
-                        "%s"
-                        "</a>"
+            for list in result:
+                for record in list:
+                    self.contract_id.message_post(
+                        body=_(
+                            "Contract manually generated: "
+                            '<a href="#" data-oe-model="%s" data-oe-id="%s">'
+                            "%s"
+                            "</a>"
+                        )
+                        % (record._name, record.id, record.display_name)
                     )
-                    % (record._name, record.id, record.display_name)
-                )
         return True

From 0f1ebf585d09843a0b56a7e76065115d93ab1246 Mon Sep 17 00:00:00 2001
From: Damien Crier <damien.crier@foodles.co>
Date: Mon, 19 Feb 2024 17:02:59 +0100
Subject: [PATCH 4/4] [IMP] contract: Set a function for wizard functionality

---
 contract/README.rst                           |  5 ++-
 contract/models/contract.py                   | 27 ++++++++++++++++
 contract/static/description/index.html        | 10 +++++-
 .../contract_manually_single_invoice.py       | 32 ++-----------------
 4 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/contract/README.rst b/contract/README.rst
index 668cf7efd1..00a8ec1ebb 100644
--- a/contract/README.rst
+++ b/contract/README.rst
@@ -7,7 +7,7 @@ Recurring - Contracts Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:124a989ae63b390105b95256e33dd7e90ea48cf66aca810d17ac432c21a016a1
+   !! source digest: sha256:f53574252f22b82e46f2bd0b62383509e616a3ad9353583b41c11cef519546fe
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
@@ -128,6 +128,9 @@ Contributors
     * Víctor Martínez
 * Iván Antón <ozono@ozonomultimedia.com>
 * Eric Antones <eantones@nuobit.com>
+* `Dixmit <https://www.dixmit.com>`_:
+
+    * Enric Tobella
 
 Maintainers
 ~~~~~~~~~~~
diff --git a/contract/models/contract.py b/contract/models/contract.py
index 2c2fd85af8..cacb5bb7f7 100644
--- a/contract/models/contract.py
+++ b/contract/models/contract.py
@@ -167,6 +167,33 @@ def write(self, vals):
             res = super(ContractContract, self).write(vals)
         return res
 
+    def generate_invoices_manually(self, date=None):
+        if date is None:
+            date = fields.Date.today()
+
+        while (
+            self.recurring_next_date
+            and self.recurring_next_date <= date
+            and (not self.date_end or self.recurring_next_date <= self.date_end)
+        ):
+            result = self.with_company(self.company_id.id)._cron_recurring_create(
+                self.recurring_next_date,
+                create_type=self.generation_type,
+                domain=[("id", "=", self.id)],
+            )
+            for record_list in result:
+                for record in record_list:
+                    self.message_post(
+                        body=_(
+                            "Contract manually generated: "
+                            '<a href="#" data-oe-model="%s" data-oe-id="%s">'
+                            "%s"
+                            "</a>"
+                        )
+                        % (record._name, record.id, record.display_name)
+                    )
+        return True
+
     @api.model
     def _set_start_contract_modification(self):
         subtype_id = self.env.ref("contract.mail_message_subtype_contract_modification")
diff --git a/contract/static/description/index.html b/contract/static/description/index.html
index 051f39ee86..c164dc527b 100644
--- a/contract/static/description/index.html
+++ b/contract/static/description/index.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -366,7 +367,7 @@ <h1 class="title">Recurring - Contracts Management</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:124a989ae63b390105b95256e33dd7e90ea48cf66aca810d17ac432c21a016a1
+!! source digest: sha256:f53574252f22b82e46f2bd0b62383509e616a3ad9353583b41c11cef519546fe
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/contract/tree/14.0/contract"><img alt="OCA/contract" src="https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/contract-14-0/contract-14-0-contract"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/contract&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module enables contracts management with recurring
@@ -486,6 +487,13 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 </li>
 <li><p class="first">Eric Antones &lt;<a class="reference external" href="mailto:eantones&#64;nuobit.com">eantones&#64;nuobit.com</a>&gt;</p>
 </li>
+<li><p class="first"><a class="reference external" href="https://www.dixmit.com">Dixmit</a>:</p>
+<blockquote>
+<ul class="simple">
+<li>Enric Tobella</li>
+</ul>
+</blockquote>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/contract/wizards/contract_manually_single_invoice.py b/contract/wizards/contract_manually_single_invoice.py
index b6793f9c11..8b3b6d6fec 100644
--- a/contract/wizards/contract_manually_single_invoice.py
+++ b/contract/wizards/contract_manually_single_invoice.py
@@ -1,7 +1,7 @@
 # Copyright 2023 Dixmit
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, fields, models
+from odoo import fields, models
 
 
 class ContractManuallySingleInvoice(models.TransientModel):
@@ -12,32 +12,4 @@ class ContractManuallySingleInvoice(models.TransientModel):
     date = fields.Date(required=True, default=lambda r: fields.Date.today())
 
     def create_invoice(self):
-        while (
-            self.contract_id.recurring_next_date
-            and self.contract_id.recurring_next_date <= self.date
-            and (
-                not self.contract_id.date_end
-                or self.contract_id.recurring_next_date <= self.contract_id.date_end
-            )
-        ):
-            result = (
-                self.env["contract.contract"]
-                .with_company(self.contract_id.company_id.id)
-                ._cron_recurring_create(
-                    self.contract_id.recurring_next_date,
-                    create_type=self.contract_id.generation_type,
-                    domain=[("id", "=", self.contract_id.id)],
-                )
-            )
-            for list in result:
-                for record in list:
-                    self.contract_id.message_post(
-                        body=_(
-                            "Contract manually generated: "
-                            '<a href="#" data-oe-model="%s" data-oe-id="%s">'
-                            "%s"
-                            "</a>"
-                        )
-                        % (record._name, record.id, record.display_name)
-                    )
-        return True
+        return self.contract_id.generate_invoices_manually(date=self.date)