diff --git a/contract/__manifest__.py b/contract/__manifest__.py
index 4314f6d011..a2c6fedf95 100644
--- a/contract/__manifest__.py
+++ b/contract/__manifest__.py
@@ -34,6 +34,7 @@
         "data/ir_ui_menu.xml",
         "wizards/contract_line_wizard.xml",
         "wizards/contract_manually_create_invoice.xml",
+        "wizards/contract_manually_single_invoice.xml",
         "wizards/contract_contract_terminate.xml",
         "views/contract_tag.xml",
         "views/abstract_contract_line.xml",
diff --git a/contract/models/abstract_contract_line.py b/contract/models/abstract_contract_line.py
index 8b3fa62b80..46a1741434 100644
--- a/contract/models/abstract_contract_line.py
+++ b/contract/models/abstract_contract_line.py
@@ -224,17 +224,27 @@ def _inverse_price_unit(self):
         for line in self.filtered(lambda x: not x.automatic_price):
             line.specific_price = line.price_unit
 
+    def _get_discounted_price_subtotal(self):
+        """Return the discounted price subtotal"""
+        subtotal = self._get_price_subtotal()
+        discount = self.discount / 100
+        subtotal *= 1 - discount
+        return subtotal
+
+    def _get_price_subtotal(self):
+        """Return the subtotal price (without discount)"""
+        self.ensure_one()
+        return self.quantity * self.price_unit
+
     @api.depends("quantity", "price_unit", "discount")
     def _compute_price_subtotal(self):
         for line in self:
-            subtotal = line.quantity * line.price_unit
-            discount = line.discount / 100
-            subtotal *= 1 - discount
+            subtotal_discounted = line._get_discounted_price_subtotal()
             if line.contract_id.pricelist_id:
                 cur = line.contract_id.pricelist_id.currency_id
-                line.price_subtotal = cur.round(subtotal)
+                line.price_subtotal = cur.round(subtotal_discounted)
             else:
-                line.price_subtotal = subtotal
+                line.price_subtotal = subtotal_discounted
 
     @api.constrains("discount")
     def _check_discount(self):
diff --git a/contract/models/contract.py b/contract/models/contract.py
index 0057e833fe..99cb5eaec4 100644
--- a/contract/models/contract.py
+++ b/contract/models/contract.py
@@ -168,6 +168,37 @@ def _compute_group_id(self):
             if len(set(all_analytic_accounts)) == 1:
                 record.group_id = all_analytic_accounts[0]
 
+    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)
+        ):
+            _logger.info(
+                f"next date {self.recurring_next_date} <= {date}, "
+                f"date end {self.date_end} "
+            )
+            # We create the invoices for the contract lines
+            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: "
+                            f'<a href="#" data-oe-model="{record._name}"'
+                            f' data-oe-id="{record.id}">'
+                            f"{record.display_name}"
+                            "</a>"
+                        )
+                    )
+        return True
+
     def get_formview_id(self, access_uid=None):
         if self.contract_type == "sale":
             return self.env.ref("contract.contract_contract_customer_form_view").id
@@ -193,6 +224,10 @@ def write(self, vals):
     @api.model
     def _set_start_contract_modification(self):
         subtype_id = self.env.ref("contract.mail_message_subtype_contract_modification")
+        _logger.warning(
+            "recurring_create_invoice is deprecated in favor of "
+            "_recurring_create_invoice instead"
+        )
         for record in self:
             if record.contract_line_ids:
                 date_start = min(record.contract_line_ids.mapped("date_start"))
@@ -669,17 +704,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,
@@ -688,6 +730,7 @@ 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(
@@ -697,8 +740,8 @@ def _cron_recurring_create(self, date_ref=False, create_type="invoice"):
                     or contract.recurring_next_date <= contract.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/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 0559e30a2b..945c4fb635 100644
--- a/contract/tests/test_contract.py
+++ b/contract/tests/test_contract.py
@@ -256,7 +256,9 @@ def test_contract(self):
         self.assertAlmostEqual(self.acct_line.price_subtotal, 50.0)
         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"))
@@ -266,7 +268,12 @@ def test_contract(self):
         self.assertEqual(self.contract.user_id, self.invoice_monthly.user_id)
 
     def test_contract_level_recurrence(self):
-        self.contract3.recurring_create_invoice()
+        self.env["contract.manually.single.invoice"].create(
+            {
+                "date": self.contract3.recurring_next_date,
+                "contract_id": self.contract3.id,
+            }
+        ).create_invoice()
         self.contract3.flush_recordset()
 
     def test_contract_daily(self):
@@ -275,7 +282,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)
@@ -294,7 +303,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)
@@ -306,7 +317,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)
@@ -318,7 +331,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)
@@ -330,7 +345,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)
@@ -342,7 +359,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)
@@ -355,7 +374,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)
@@ -367,7 +388,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)
@@ -380,7 +403,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)
@@ -393,7 +418,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)
@@ -406,7 +433,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)
@@ -419,7 +448,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)
@@ -499,7 +530,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):
@@ -1090,7 +1126,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")),
@@ -1746,14 +1784,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,
@@ -1775,7 +1817,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,
@@ -1785,7 +1829,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,
@@ -1795,7 +1841,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,
@@ -1811,7 +1859,9 @@ def test_get_period_to_invoice_monthly_pre_paid_2(self):
         self.acct_line.recurring_invoicing_type = "pre-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,
@@ -1831,7 +1881,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,
@@ -1857,14 +1909,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,
@@ -1883,14 +1939,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,
@@ -1909,14 +1969,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,
@@ -1935,14 +1999,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,
@@ -2185,9 +2253,15 @@ def test_sale_get_view(self):
         self.assertEqual(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)
 
@@ -2224,9 +2298,21 @@ def test_invoice_contract_without_lines(self):
         self.contract.contract_line_ids.cancel()
         self.contract.contract_line_ids.unlink()
         self.assertFalse(self.contract.recurring_create_invoice())
+        # self.assertFalse(
+        #     self.env["contract.manually.single.invoice"]
+        #     .create(
+        #         {
+        #             "date": self.contract.recurring_next_date,
+        #             "contract_id": self.contract.id,
+        #         }
+        #     )
+        #     .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)
@@ -2285,7 +2371,9 @@ def test_action_terminate_contract(self):
         self.assertFalse(self.contract.terminate_comment)
 
     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 b8a5fd537d..1c33e062cc 100644
--- a/contract/tests/test_contract_manually_create_invoice.py
+++ b/contract/tests/test_contract_manually_create_invoice.py
@@ -45,6 +45,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 0cac09f3c6..a5880ef9b5 100644
--- a/contract/views/contract.xml
+++ b/contract/views/contract.xml
@@ -39,11 +39,11 @@
                         groups="base.group_user"
                     />
                     <button
-                        name="recurring_create_invoice"
-                        type="object"
-                        invisible="not create_invoice_visibility and 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"
+                        invisible="not id or generation_type != 'invoice'"
+                        context="{'default_contract_id': id, 'default_date': recurring_next_date}"
                     />
                     <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..8b3b6d6fec
--- /dev/null
+++ b/contract/wizards/contract_manually_single_invoice.py
@@ -0,0 +1,15 @@
+# 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):
+        return self.contract_id.generate_invoices_manually(date=self.date)
diff --git a/contract/wizards/contract_manually_single_invoice.xml b/contract/wizards/contract_manually_single_invoice.xml
new file mode 100644
index 0000000000..280a05ec2c
--- /dev/null
+++ b/contract/wizards/contract_manually_single_invoice.xml
@@ -0,0 +1,40 @@
+<?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">
+                <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>
+        <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>
diff --git a/contract_exception/README.rst b/contract_exception/README.rst
new file mode 100644
index 0000000000..8bc40f254c
--- /dev/null
+++ b/contract_exception/README.rst
@@ -0,0 +1,71 @@
+==================
+Contract Exception
+==================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:b8680ad2e932bdfb1201db3228164ea130fe592dea5564cb465b2e2fa0851e81
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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/17.0/contract_exception
+    :alt: OCA/contract
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/contract-17-0/contract-17-0-contract_exception
+    :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=17.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This module allow to configure contract exception
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/contract/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 <https://github.com/OCA/contract/issues/new?body=module:%20contract_exception%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* Foodles
+
+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 <https://github.com/OCA/contract/tree/17.0/contract_exception>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/contract_exception/__init__.py b/contract_exception/__init__.py
new file mode 100644
index 0000000000..b046ff82fc
--- /dev/null
+++ b/contract_exception/__init__.py
@@ -0,0 +1 @@
+from . import models, wizard
diff --git a/contract_exception/__manifest__.py b/contract_exception/__manifest__.py
new file mode 100644
index 0000000000..7b970cebaf
--- /dev/null
+++ b/contract_exception/__manifest__.py
@@ -0,0 +1,21 @@
+# Copyright 2024 Foodles (http://www.foodles.co/)
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+{
+    "name": "Contract Exception",
+    "version": "17.0.1.0.0",
+    "category": "Contract Management",
+    "author": "Odoo Community Association (OCA), Foodles",
+    "website": "https://github.com/OCA/contract",
+    "depends": [
+        "base_exception",
+        "contract",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "data/contract_exception_data.xml",
+        "views/contract_views.xml",
+        "wizard/contract_exception_confirm_view.xml",
+    ],
+    "license": "AGPL-3",
+    "installable": True,
+}
diff --git a/contract_exception/data/contract_exception_data.xml b/contract_exception/data/contract_exception_data.xml
new file mode 100644
index 0000000000..1031ca2d41
--- /dev/null
+++ b/contract_exception/data/contract_exception_data.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo noupdate="1">
+    <record forcecreate="True" id="ir_cron_test_contract" model="ir.cron">
+        <field name="name">Test Contracts</field>
+        <field name="active" eval="False" />
+        <field name="user_id" ref="base.user_root" />
+        <field name="interval_number">20</field>
+        <field name="interval_type">minutes</field>
+        <field name="numbercall">-1</field>
+        <field eval="False" name="doall" />
+        <field name="model_id" ref="contract.model_contract_contract" />
+        <field name="state">code</field>
+        <field name="code">model.test_all_contracts()</field>
+    </record>
+</odoo>
diff --git a/contract_exception/models/__init__.py b/contract_exception/models/__init__.py
new file mode 100644
index 0000000000..0c523d8527
--- /dev/null
+++ b/contract_exception/models/__init__.py
@@ -0,0 +1,5 @@
+from . import (
+    contract,
+    contract_line,
+    exception_rule,
+)
diff --git a/contract_exception/models/contract.py b/contract_exception/models/contract.py
new file mode 100644
index 0000000000..01f37de95b
--- /dev/null
+++ b/contract_exception/models/contract.py
@@ -0,0 +1,50 @@
+# Copyright 2024 Foodles (https://www.foodles.co/).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, models
+
+
+class Contract(models.Model):
+    _inherit = ["contract.contract", "base.exception"]
+    _name = "contract.contract"
+
+    @api.model_create_multi
+    def create(self, vals):
+        record = super().create(vals)
+        record._contract_check_exception(vals)
+        return record
+
+    def write(self, vals):
+        result = super().write(vals)
+        self._contract_check_exception(vals)
+        return result
+
+    @api.model
+    def _reverse_field(self):
+        return "contract_ids"
+
+    def _fields_trigger_check_exception(self):
+        return ["ignore_exception", "contract_line_ids"]
+
+    def detect_exceptions(self):
+        all_exceptions = super().detect_exceptions()
+        lines = self.mapped("contract_line_ids")
+        all_exceptions += lines.detect_exceptions()
+        return all_exceptions
+
+    def _contract_check_exception(self, vals):
+        check_exceptions = any(
+            field in vals for field in self._fields_trigger_check_exception()
+        )
+        if check_exceptions:
+            self.detect_exceptions()
+
+    @api.model
+    def test_all_contracts(self):
+        contract_set = self.search([])
+        contract_set.detect_exceptions()
+        return True
+
+    @api.model
+    def _get_popup_action(self):
+        return self.env.ref("contract_exception.action_contract_exception_confirm")
diff --git a/contract_exception/models/contract_line.py b/contract_exception/models/contract_line.py
new file mode 100644
index 0000000000..e0e65f7ccc
--- /dev/null
+++ b/contract_exception/models/contract_line.py
@@ -0,0 +1,25 @@
+# Copyright 2024 Foodles (https://www.foodles.co/).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import api, fields, models
+
+
+class ContractLine(models.Model):
+    _inherit = ["contract.line", "base.exception.method"]
+    _name = "contract.line"
+
+    ignore_exception = fields.Boolean(
+        related="contract_id.ignore_exception", store=True, string="Ignore Exceptions"
+    )
+
+    def _get_main_records(self):
+        return self.mapped("contract_id")
+
+    @api.model
+    def _reverse_field(self):
+        return "contract_ids"
+
+    def _detect_exceptions(self, rule):
+        records = super()._detect_exceptions(rule)
+        return records.mapped("contract_id")
diff --git a/contract_exception/models/exception_rule.py b/contract_exception/models/exception_rule.py
new file mode 100644
index 0000000000..4509a4e31b
--- /dev/null
+++ b/contract_exception/models/exception_rule.py
@@ -0,0 +1,22 @@
+# Copyright 2024 Foodles (https://www.foodles.co/).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class ExceptionRule(models.Model):
+    _inherit = "exception.rule"
+
+    contract_ids = fields.Many2many(
+        comodel_name="contract.contract", string="Contracts"
+    )
+    model = fields.Selection(
+        selection_add=[
+            ("contract.contract", "Contract"),
+            ("contract.line", "Contract line"),
+        ],
+        ondelete={
+            "contract.contract": "cascade",
+            "contract.line": "cascade",
+        },
+    )
diff --git a/contract_exception/pyproject.toml b/contract_exception/pyproject.toml
new file mode 100644
index 0000000000..4231d0cccb
--- /dev/null
+++ b/contract_exception/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/contract_exception/readme/DESCRIPTION.md b/contract_exception/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..9d59f96da0
--- /dev/null
+++ b/contract_exception/readme/DESCRIPTION.md
@@ -0,0 +1 @@
+This module allow to configure contract exception
diff --git a/contract_exception/security/ir.model.access.csv b/contract_exception/security/ir.model.access.csv
new file mode 100644
index 0000000000..e2598f5721
--- /dev/null
+++ b/contract_exception/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_contract_exception_confirm,contract.exception.confirm,model_contract_exception_confirm,base_exception.group_exception_rule_manager,1,1,1,1
diff --git a/contract_exception/static/description/index.html b/contract_exception/static/description/index.html
new file mode 100644
index 0000000000..3141d01ac7
--- /dev/null
+++ b/contract_exception/static/description/index.html
@@ -0,0 +1,416 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>Contract Exception</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="contract-exception">
+<h1 class="title">Contract Exception</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:b8680ad2e932bdfb1201db3228164ea130fe592dea5564cb465b2e2fa0851e81
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.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/17.0/contract_exception"><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-17-0/contract-17-0-contract_exception"><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=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This module allow to configure contract exception</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-4">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/contract/issues">GitHub Issues</a>.
+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
+<a class="reference external" href="https://github.com/OCA/contract/issues/new?body=module:%20contract_exception%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>Foodles</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-4">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
+<p>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.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/contract/tree/17.0/contract_exception">OCA/contract</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/contract_exception/tests/__init__.py b/contract_exception/tests/__init__.py
new file mode 100644
index 0000000000..3c02082d69
--- /dev/null
+++ b/contract_exception/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_contract
diff --git a/contract_exception/tests/test_contract.py b/contract_exception/tests/test_contract.py
new file mode 100644
index 0000000000..7dacafc484
--- /dev/null
+++ b/contract_exception/tests/test_contract.py
@@ -0,0 +1,67 @@
+# Copyright 2024 Foodles (https://www.foodles.co/).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from unittest.mock import patch
+
+from odoo.tests import TransactionCase
+
+
+class TestContract(TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.customer = cls.env["res.partner"].create({"name": "Test Customer"})
+        cls.contract = cls.env["contract.contract"].create(
+            {"name": "Test Contract", "partner_id": cls.customer.id}
+        )
+
+    @patch("odoo.addons.contract_exception.models.contract.Contract.detect_exceptions")
+    @patch(
+        "odoo.addons.contract_exception."
+        "models.contract.Contract._fields_trigger_check_exception"
+    )
+    def test_contract_check_exception_with_field_that_trigger_exception(
+        self, mock_fields_trigger_check_exception, mock_detect_exceptions
+    ):
+        mock_fields_trigger_check_exception.return_value = ["partner_id"]
+        self.contract._contract_check_exception({"partner_id": 1})
+        mock_detect_exceptions.assert_called_once()
+
+    @patch("odoo.addons.contract_exception.models.contract.Contract.detect_exceptions")
+    @patch(
+        "odoo.addons.contract_exception."
+        "models.contract.Contract._fields_trigger_check_exception"
+    )
+    def test_contract_check_exception_without_field_that_trigger_exception(
+        self, mock_fields_trigger_check_exception, mock_detect_exceptions
+    ):
+        mock_fields_trigger_check_exception.return_value = []
+        self.contract._contract_check_exception({"partner_id": 1})
+        self.assertEqual(mock_detect_exceptions.call_count, 0)
+
+    def test_detect_exceptions(self):
+        rules = self.env["exception.rule"].create(
+            [
+                {
+                    "name": "Test Rule",
+                    "model": "contract.contract",
+                    "code": "failed=True",
+                },
+                {
+                    "name": "Test contract line Rule",
+                    "model": "contract.line",
+                    "code": "failed=True",
+                },
+            ]
+        )
+        self.contract.contract_line_ids = [(0, 0, {"name": "Test Line"})]
+        exceptions = self.contract.detect_exceptions()
+        self.assertEqual(exceptions, rules.ids)
+
+    @patch("odoo.addons.contract_exception.models.contract.Contract.detect_exceptions")
+    def test_all_contracts(self, mock_detect_exceptions):
+        self.env["contract.contract"].test_all_contracts()
+        self.assertEqual(
+            self.env["contract.contract"].search_count([]),
+            mock_detect_exceptions.call_count,
+        )
diff --git a/contract_exception/views/contract_views.xml b/contract_exception/views/contract_views.xml
new file mode 100644
index 0000000000..96db7d2750
--- /dev/null
+++ b/contract_exception/views/contract_views.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record id="action_contract_test_tree" model="ir.actions.act_window">
+        <field name="name">Contract Exception Rules</field>
+        <field name="res_model">exception.rule</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="base_exception.view_exception_rule_tree" />
+        <field
+            name="domain"
+        >[('model', 'in', ['contract.contract', 'contract.line'])]</field>
+        <field
+            name="context"
+        >{'active_test': False, 'default_model' : 'contract.contract'}</field>
+    </record>
+    <menuitem
+        action="action_contract_test_tree"
+        id="menu_contract_test"
+        sequence="90"
+        parent="account.account_management_menu"
+        groups="base_exception.group_exception_rule_manager"
+    />
+    <record id="view_order_form" model="ir.ui.view">
+        <field name="name">contract_exception.view_contract_form</field>
+        <field name="model">contract.contract</field>
+        <field name="inherit_id" ref="contract.contract_contract_form_view" />
+        <field name="arch" type="xml">
+            <sheet position="before">
+                <div
+                    class="alert alert-danger"
+                    role="alert"
+                    style="margin-bottom:0px;"
+                    invisible="not exceptions_summary"
+                >
+                    <p>
+                        <strong>There are exceptions on this contract:</strong>
+                    </p>
+                    <field name="exceptions_summary" />
+                    <button
+                        name="action_ignore_exceptions"
+                        type="object"
+                        class="btn-danger"
+                        string="Ignore Exceptions"
+                        help="Click here to be able to confirm this contract regardless of the exceptions."
+                        groups="base_exception.group_exception_rule_manager"
+                    />
+                </div>
+            </sheet>
+            <xpath expr="//field[@name='contract_template_id']/.." position="inside">
+                <field name="ignore_exception" />
+            </xpath>
+            <xpath expr="//field[@name='contract_line_ids']/tree" position="inside">
+                <field name="ignore_exception" invisible="1" />
+            </xpath>
+        </field>
+    </record>
+    <record id="view_contract_tree" model="ir.ui.view">
+        <field name="name">contract_exception.view_order_tree</field>
+        <field name="model">contract.contract</field>
+        <field name="inherit_id" ref="contract.contract_contract_tree_view" />
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="main_exception_id" />
+            </field>
+        </field>
+    </record>
+
+    <record id="contract_contract_search_view" model="ir.ui.view">
+        <field name="name">contract_exception.view_contracts_filter</field>
+        <field name="model">contract.contract</field>
+        <field name="inherit_id" ref="contract.contract_contract_search_view" />
+        <field name="arch" type="xml">
+            <filter name="group_by_date_end" position="after">
+                <separator orientation="vertical" />
+                <filter
+                    icon="terp-emblem-important"
+                    name="tofix"
+                    string="Blocked"
+                    domain="[('main_exception_id','!=',False)]"
+                />
+            </filter>
+        </field>
+    </record>
+</odoo>
diff --git a/contract_exception/wizard/__init__.py b/contract_exception/wizard/__init__.py
new file mode 100644
index 0000000000..f12ac31969
--- /dev/null
+++ b/contract_exception/wizard/__init__.py
@@ -0,0 +1 @@
+from . import contract_exception_confirm, contract_manually_single_invoice
diff --git a/contract_exception/wizard/contract_exception_confirm.py b/contract_exception/wizard/contract_exception_confirm.py
new file mode 100644
index 0000000000..9048406828
--- /dev/null
+++ b/contract_exception/wizard/contract_exception_confirm.py
@@ -0,0 +1,23 @@
+# Copyright 2024 Foodles (https://www.foodles.co/).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class ContractExceptionConfirm(models.TransientModel):
+    _name = "contract.exception.confirm"
+    _description = "Contract exception wizard"
+    _inherit = ["exception.rule.confirm"]
+
+    related_model_id = fields.Many2one(
+        comodel_name="contract.contract", string="Contract"
+    )
+
+    date = fields.Date(required=True)
+
+    def action_confirm(self):
+        self.ensure_one()
+        if self.ignore:
+            self.related_model_id.ignore_exception = True
+            self.related_model_id.generate_invoices_manually(self.date)
+        return super().action_confirm()
diff --git a/contract_exception/wizard/contract_exception_confirm_view.xml b/contract_exception/wizard/contract_exception_confirm_view.xml
new file mode 100644
index 0000000000..43c700b00d
--- /dev/null
+++ b/contract_exception/wizard/contract_exception_confirm_view.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_contract_exception_confirm" model="ir.ui.view">
+        <field name="name">Contract Exceptions</field>
+        <field name="model">contract.exception.confirm</field>
+        <field name="arch" type="xml">
+            <form string="Can't generate invoice due to contract exception">
+                <group>
+
+                    <field name="exception_ids" nolabel="1" colspan="4">
+                        <tree>
+                            <field name="name" />
+                            <field name="description" />
+                        </tree>
+                    </field>
+                    <newline />
+                    <field name="ignore" groups='sales_team.group_sale_manager' />
+                    <field name="date" />
+                </group>
+                <footer>
+                    <button
+                        name="action_confirm"
+                        string="Confirm"
+                        colspan="1"
+                        type="object"
+                    />
+                    <button class="oe_link" special="cancel" string="Cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+    <record id="action_contract_exception_confirm" model="ir.actions.act_window">
+        <field name="name">Outstanding exceptions to manage</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">contract.exception.confirm</field>
+        <field name="view_mode">form</field>
+        <field
+            name="view_id"
+            ref="contract_exception.view_contract_exception_confirm"
+        />
+        <field name="target">new</field>
+    </record>
+</odoo>
diff --git a/contract_exception/wizard/contract_manually_single_invoice.py b/contract_exception/wizard/contract_manually_single_invoice.py
new file mode 100644
index 0000000000..a2b72b4194
--- /dev/null
+++ b/contract_exception/wizard/contract_manually_single_invoice.py
@@ -0,0 +1,18 @@
+# Copyright 2024 Foodles (https://www.foodles.co/).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import models
+
+
+class ContractManuallySingleInvoice(models.TransientModel):
+    _inherit = "contract.manually.single.invoice"
+
+    def create_invoice(self):
+        if (
+            self.contract_id.detect_exceptions()
+            and not self.contract_id.ignore_exception
+        ):
+            action = self.contract_id._popup_exceptions()
+            action.get("context").update({"default_date": self.date})
+            return action
+        return self.contract_id.generate_invoices_manually(date=self.date)
diff --git a/contract_fixed_discount/README.rst b/contract_fixed_discount/README.rst
new file mode 100644
index 0000000000..e34d850422
--- /dev/null
+++ b/contract_fixed_discount/README.rst
@@ -0,0 +1,80 @@
+=======================
+Contract Fixed Discount
+=======================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:248ecda633fa484cca711149034c32d4933d58984763d6ff3a39084ed143afdb
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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/17.0/contract_fixed_discount
+    :alt: OCA/contract
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/contract-17-0/contract-17-0-contract_fixed_discount
+    :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=17.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This module extends the functionality of contracts to allow you to apply
+fixed amount discounts at contract line level.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/contract/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 <https://github.com/OCA/contract/issues/new?body=module:%20contract_fixed_discount%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* Foodles
+
+Contributors
+------------
+
+- `Foodles <https://www.foodles.co>`__:
+
+  - Damien Crier <damien.crier@foodles.co>
+  - Pierre Verkest <pierreverkest84@gmail.com>
+
+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 <https://github.com/OCA/contract/tree/17.0/contract_fixed_discount>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/contract_fixed_discount/__init__.py b/contract_fixed_discount/__init__.py
new file mode 100644
index 0000000000..0650744f6b
--- /dev/null
+++ b/contract_fixed_discount/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/contract_fixed_discount/__manifest__.py b/contract_fixed_discount/__manifest__.py
new file mode 100644
index 0000000000..777e6491a2
--- /dev/null
+++ b/contract_fixed_discount/__manifest__.py
@@ -0,0 +1,20 @@
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+{
+    "name": "Contract Fixed Discount",
+    "version": "17.0.1.0.0",
+    "category": "Contract Management",
+    "author": "Foodles, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/contract",
+    "depends": [
+        "account_invoice_fixed_discount",
+        "contract",
+    ],
+    "data": [
+        "views/abstract_contract_line.xml",
+        "views/contract_line.xml",
+        "views/contract.xml",
+    ],
+    "license": "AGPL-3",
+    "installable": True,
+}
diff --git a/contract_fixed_discount/models/__init__.py b/contract_fixed_discount/models/__init__.py
new file mode 100644
index 0000000000..7e693e1cff
--- /dev/null
+++ b/contract_fixed_discount/models/__init__.py
@@ -0,0 +1 @@
+from . import abstract_contract_line, contract_line
diff --git a/contract_fixed_discount/models/abstract_contract_line.py b/contract_fixed_discount/models/abstract_contract_line.py
new file mode 100644
index 0000000000..6bcb17261f
--- /dev/null
+++ b/contract_fixed_discount/models/abstract_contract_line.py
@@ -0,0 +1,44 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class ContractAbstractContractLine(models.AbstractModel):
+    _inherit = "contract.abstract.contract.line"
+
+    discount_fixed = fields.Float(
+        string="Discount (Fixed)",
+        digits="Product Price",
+        default=0.00,
+        help="Fixed amount discount.",
+    )
+
+    @api.onchange("discount")
+    def _onchange_discount(self):
+        if self.discount:
+            self.discount_fixed = 0.0
+
+    @api.onchange("discount_fixed")
+    def _onchange_discount_fixed(self):
+        if self.discount_fixed:
+            self.discount = 0.0
+
+    @api.constrains("discount", "discount_fixed")
+    def _check_only_one_discount(self):
+        for rec in self:
+            for line in rec:
+                if line.discount and line.discount_fixed:
+                    raise ValidationError(
+                        _("You can only set one type of discount per line.")
+                    )
+
+    def _get_discounted_price_subtotal(self):
+        self.ensure_one()
+        if self.discount_fixed:
+            return self._get_price_subtotal() - self.discount_fixed
+        return super()._get_discounted_price_subtotal()
+
+    @api.depends("quantity", "price_unit", "discount", "discount_fixed")
+    def _compute_price_subtotal(self):
+        return super()._compute_price_subtotal()
diff --git a/contract_fixed_discount/models/contract_line.py b/contract_fixed_discount/models/contract_line.py
new file mode 100644
index 0000000000..5f99cfab4c
--- /dev/null
+++ b/contract_fixed_discount/models/contract_line.py
@@ -0,0 +1,12 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class ContractLine(models.Model):
+    _inherit = "contract.line"
+
+    def _prepare_invoice_line(self):
+        vals = super()._prepare_invoice_line()
+        vals["discount_fixed"] = self.discount_fixed
+        return vals
diff --git a/contract_fixed_discount/pyproject.toml b/contract_fixed_discount/pyproject.toml
new file mode 100644
index 0000000000..4231d0cccb
--- /dev/null
+++ b/contract_fixed_discount/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/contract_fixed_discount/readme/CONTRIBUTORS.md b/contract_fixed_discount/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000000..9835ba764f
--- /dev/null
+++ b/contract_fixed_discount/readme/CONTRIBUTORS.md
@@ -0,0 +1,3 @@
+- [Foodles](https://www.foodles.co):
+  - Damien Crier \<damien.crier@foodles.co\>
+  - Pierre Verkest \<pierreverkest84@gmail.com\>
diff --git a/contract_fixed_discount/readme/DESCRIPTION.md b/contract_fixed_discount/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..e3dda6ebf0
--- /dev/null
+++ b/contract_fixed_discount/readme/DESCRIPTION.md
@@ -0,0 +1,2 @@
+This module extends the functionality of contracts to allow you to apply
+fixed amount discounts at contract line level.
diff --git a/contract_fixed_discount/static/description/index.html b/contract_fixed_discount/static/description/index.html
new file mode 100644
index 0000000000..d99d44c234
--- /dev/null
+++ b/contract_fixed_discount/static/description/index.html
@@ -0,0 +1,428 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>Contract Fixed Discount</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="contract-fixed-discount">
+<h1 class="title">Contract Fixed Discount</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:248ecda633fa484cca711149034c32d4933d58984763d6ff3a39084ed143afdb
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.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/17.0/contract_fixed_discount"><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-17-0/contract-17-0-contract_fixed_discount"><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=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This module extends the functionality of contracts to allow you to apply
+fixed amount discounts at contract line level.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/contract/issues">GitHub Issues</a>.
+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
+<a class="reference external" href="https://github.com/OCA/contract/issues/new?body=module:%20contract_fixed_discount%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>Foodles</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="https://www.foodles.co">Foodles</a>:<ul>
+<li>Damien Crier &lt;<a class="reference external" href="mailto:damien.crier&#64;foodles.co">damien.crier&#64;foodles.co</a>&gt;</li>
+<li>Pierre Verkest &lt;<a class="reference external" href="mailto:pierreverkest84&#64;gmail.com">pierreverkest84&#64;gmail.com</a>&gt;</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
+<p>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.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/contract/tree/17.0/contract_fixed_discount">OCA/contract</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/contract_fixed_discount/tests/__init__.py b/contract_fixed_discount/tests/__init__.py
new file mode 100644
index 0000000000..f6ebcaee35
--- /dev/null
+++ b/contract_fixed_discount/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_contract_discount_fixed, test_contract_invoice_discount_fixed
diff --git a/contract_fixed_discount/tests/test_contract_discount_fixed.py b/contract_fixed_discount/tests/test_contract_discount_fixed.py
new file mode 100644
index 0000000000..766a417bc2
--- /dev/null
+++ b/contract_fixed_discount/tests/test_contract_discount_fixed.py
@@ -0,0 +1,67 @@
+# Copyright 2023 Foodles (http://www.foodles.co/)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.exceptions import ValidationError
+from odoo.tests import Form
+
+from odoo.addons.contract.tests.test_contract import TestContractBase
+
+
+class TestContractDiscounts(TestContractBase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env.ref("product.group_discount_per_so_line").users = [(4, cls.env.user.id)]
+
+        cls.contract4 = cls.env["contract.contract"].create(
+            {
+                "name": "Test Contract4",
+                "partner_id": cls.partner.id,
+                "pricelist_id": cls.partner.property_product_pricelist.id,
+                "line_recurrence": True,
+                "contract_line_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "product_id": cls.product_1.id,
+                            "name": "Services from #START# to #END#",
+                            "quantity": 1,
+                            "uom_id": cls.product_1.uom_id.id,
+                            "price_unit": 100,
+                            "discount_fixed": 48,
+                            "recurring_rule_type": "monthly",
+                            "recurring_interval": 1,
+                            "date_start": "2018-02-15",
+                            "recurring_next_date": "2018-02-22",
+                        },
+                    )
+                ],
+            }
+        )
+
+        cls.contract4.contract_line_ids._compute_price_subtotal()
+
+    def test_onchange_discount(self):
+        contract = Form(self.contract)
+        line = contract.contract_line_ids.edit(0)
+        line.discount_fixed = 42
+        self.assertFalse(line.discount)
+
+    def test_onchange_discount_fixed(self):
+        contract = Form(self.contract)
+        line = contract.contract_line_ids.edit(0)
+        line.discount = 42
+        self.assertFalse(line.discount_fixed)
+
+    def test_constraint_discount_discount_fixed(self):
+        with self.assertRaisesRegex(
+            ValidationError, "You can only set one type of discount per line."
+        ):
+            self.contract4.contract_line_ids.discount = 42
+
+    def test_price_subtotal_discount_percent(self):
+        self.assertEqual(self.contract.contract_line_ids.price_subtotal, 50.0)
+
+    def test_price_subtotal_discount_fixed(self):
+        self.assertEqual(self.contract4.contract_line_ids.price_subtotal, 52.0)
diff --git a/contract_fixed_discount/tests/test_contract_invoice_discount_fixed.py b/contract_fixed_discount/tests/test_contract_invoice_discount_fixed.py
new file mode 100644
index 0000000000..e4b712940c
--- /dev/null
+++ b/contract_fixed_discount/tests/test_contract_invoice_discount_fixed.py
@@ -0,0 +1,43 @@
+# Copyright 2023 Foodles (http://www.foodles.co/)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.addons.contract.tests.test_contract import TestContractBase
+
+
+class TestContractDiscounts(TestContractBase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env.ref("product.group_discount_per_so_line").users = [(4, cls.env.user.id)]
+
+        cls.contract4 = cls.env["contract.contract"].create(
+            {
+                "name": "Test Contract4",
+                "partner_id": cls.partner.id,
+                "pricelist_id": cls.partner.property_product_pricelist.id,
+                "line_recurrence": True,
+                "contract_line_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "product_id": cls.product_1.id,
+                            "name": "Services from #START# to #END#",
+                            "quantity": 1,
+                            "uom_id": cls.product_1.uom_id.id,
+                            "price_unit": 100,
+                            "discount_fixed": 48,
+                            "recurring_rule_type": "monthly",
+                            "recurring_interval": 1,
+                            "date_start": "2018-02-15",
+                            "recurring_next_date": "2018-02-22",
+                        },
+                    )
+                ],
+            }
+        )
+
+    def test_invoice_lines_discount_fixed(self):
+        invoice = self.contract4.recurring_create_invoice()
+        self.assertEqual(invoice.invoice_line_ids.discount_fixed, 48)
+        self.assertEqual(invoice.invoice_line_ids.discount, 0)
diff --git a/contract_fixed_discount/views/abstract_contract_line.xml b/contract_fixed_discount/views/abstract_contract_line.xml
new file mode 100644
index 0000000000..62658a00bf
--- /dev/null
+++ b/contract_fixed_discount/views/abstract_contract_line.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record
+        id="contract_abstract_contract_line_add_discount_fixed_form_view"
+        model="ir.ui.view"
+    >
+        <field
+            name="name"
+        >contract.abstract.contract.line form view (in contract)</field>
+        <field name="model">contract.abstract.contract.line</field>
+        <field
+            name="inherit_id"
+            ref="contract.contract_abstract_contract_line_form_view"
+        />
+
+        <field name="arch" type="xml">
+            <field name="discount" position="after">
+                <field
+                    name="discount_fixed"
+                    groups="product.group_discount_per_so_line"
+                />
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/contract_fixed_discount/views/contract.xml b/contract_fixed_discount/views/contract.xml
new file mode 100644
index 0000000000..3199d6dff8
--- /dev/null
+++ b/contract_fixed_discount/views/contract.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="contract_contract_form_view" model="ir.ui.view">
+        <field name="name">contract.contract form view (in contract)</field>
+        <field name="model">contract.contract</field>
+        <field name="inherit_id" ref="contract.contract_contract_form_view" />
+        <field name="arch" type="xml">
+            <xpath
+                expr="//field[@name='contract_line_fixed_ids']//tree//field[@name='discount']"
+                position="after"
+            >
+                <field
+                    name="discount_fixed"
+                    groups="product.group_discount_per_so_line"
+                    optional="show"
+                />
+            </xpath>
+            <xpath
+                expr="//field[@name='contract_line_ids']//tree//field[@name='discount']"
+                position="after"
+            >
+                <field
+                    name="discount_fixed"
+                    groups="product.group_discount_per_so_line"
+                    optional="show"
+                />
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/contract_fixed_discount/views/contract_line.xml b/contract_fixed_discount/views/contract_line.xml
new file mode 100644
index 0000000000..29292d8dfd
--- /dev/null
+++ b/contract_fixed_discount/views/contract_line.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="contract_line_tree_view" model="ir.ui.view">
+        <field name="name">contract.contract_line_tree_view</field>
+        <field name="model">contract.line</field>
+        <field name="inherit_id" ref="contract.contract_line_tree_view" />
+
+        <field name="arch" type="xml">
+            <field name="discount" position="after">
+                <field
+                    name="discount_fixed"
+                    groups="product.group_discount_per_so_line"
+                    optional="show"
+                />
+            </field>
+        </field>
+    </record>
+
+    <record id="contract_line_report_tree_view" model="ir.ui.view">
+        <field name="name">contract.contract_line_report_tree_view</field>
+        <field name="model">contract.line</field>
+        <field name="inherit_id" ref="contract.contract_line_report_tree_view" />
+
+        <field name="arch" type="xml">
+            <field name="discount" position="after">
+                <field
+                    name="discount_fixed"
+                    groups="product.group_discount_per_so_line"
+                    optional="show"
+                />
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/product_contract/models/product_template.py b/product_contract/models/product_template.py
index 9c899adfbe..0cd89df64b 100644
--- a/product_contract/models/product_template.py
+++ b/product_contract/models/product_template.py
@@ -113,7 +113,7 @@ class ProductTemplate(models.Model):
             ("2", "Second month"),
             ("3", "Third month"),
         ],
-        "Force Month",
+        "Force Month inside quarter",
         help="Force the month to be used inside the quarter",
     )
     force_month_semesterly = fields.Selection(
@@ -125,7 +125,7 @@ class ProductTemplate(models.Model):
             ("5", "Fifth month"),
             ("6", "Sixth month"),
         ],
-        "Force Month",
+        "Force Month inside semester",
         help="Force the month to be used inside the semester",
     )
 
diff --git a/product_contract/models/sale_order_line.py b/product_contract/models/sale_order_line.py
index d7d7e09a81..0a9739cbc8 100644
--- a/product_contract/models/sale_order_line.py
+++ b/product_contract/models/sale_order_line.py
@@ -34,7 +34,7 @@ class SaleOrderLine(models.Model):
         string="Invoice Every",
         help="Invoice every (Days/Week/Month/Year)",
     )
-    recurring_rule_type = fields.Selection(related="product_id.recurring_rule_type")
+    recurring_rule_type = fields.Selection(related="product_id.recurring_rule_type", string="Invoice Every type")
     recurring_invoicing_type = fields.Selection(
         related="product_id.recurring_invoicing_type"
     )
diff --git a/product_contract/tests/common.py b/product_contract/tests/common.py
new file mode 100644
index 0000000000..cd3d62d7bc
--- /dev/null
+++ b/product_contract/tests/common.py
@@ -0,0 +1,70 @@
+# Copyright 2017 LasLabs Inc.
+# Copyright 2018 ACSONE SA/NV
+# Copyright 2018 Foodles
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo.tests.common import TransactionCase
+
+
+class CommonProductContractSaleOrderCase(TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env = cls.env(
+            context=dict(
+                cls.env.context,
+                tracking_disable=True,
+                no_reset_password=True,
+            )
+        )
+        cls.partner = cls.env["res.partner"].create({"name": "Test partner"})
+        cls.product1 = cls.env.ref("product.product_product_1")
+        cls.product2 = cls.env.ref("product.product_product_2")
+        cls.sale = cls.env.ref("sale.sale_order_2")
+        cls.contract_template1 = cls.env["contract.template"].create(
+            {"name": "Template 1"}
+        )
+        cls.contract_template2 = cls.env["contract.template"].create(
+            {
+                "name": "Template 2",
+                "contract_line_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "product_id": cls.product2.id,
+                            "name": "Services from #START# to #END#",
+                            "quantity": 1,
+                            "uom_id": cls.product2.uom_id.id,
+                            "price_unit": 100,
+                            "discount": 50,
+                            "recurring_rule_type": "yearly",
+                            "recurring_interval": 1,
+                        },
+                    )
+                ],
+            }
+        )
+        cls.product1.with_company(cls.sale.company_id).write(
+            {
+                "is_contract": True,
+                "default_qty": 12,
+                "recurring_rule_type": "monthlylastday",
+                "recurring_invoicing_type": "post-paid",
+                "property_contract_template_id": cls.contract_template1.id,
+            }
+        )
+        cls.product2.with_company(cls.sale.company_id).write(
+            {
+                "is_contract": True,
+                "property_contract_template_id": cls.contract_template2.id,
+            }
+        )
+        cls.order_line1 = cls.sale.order_line.filtered(
+            lambda line: line.product_id == cls.product1
+        )
+        cls.order_line1.date_start = "2018-01-01"
+        cls.order_line1.product_uom_qty = 12
+        cls.order_line2 = cls.sale.order_line.filtered(
+            lambda line: line.product_id == cls.product2
+        )
diff --git a/product_contract/tests/test_sale_order.py b/product_contract/tests/test_sale_order.py
index 6f266b2a6b..71957f088f 100644
--- a/product_contract/tests/test_sale_order.py
+++ b/product_contract/tests/test_sale_order.py
@@ -8,68 +8,14 @@
 from odoo import fields
 from odoo.exceptions import ValidationError
 from odoo.fields import Date
-from odoo.tests.common import TransactionCase
 
+from .common import CommonProductContractSaleOrderCase
 
-class TestSaleOrder(TransactionCase):
+
+class TestSaleOrder(CommonProductContractSaleOrderCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.env = cls.env(
-            context=dict(
-                cls.env.context,
-                tracking_disable=True,
-                no_reset_password=True,
-            )
-        )
-        cls.partner = cls.env["res.partner"].create({"name": "Test partner"})
-        cls.product1 = cls.env.ref("product.product_product_1")
-        cls.product2 = cls.env.ref("product.product_product_2")
-        cls.sale = cls.env.ref("sale.sale_order_2")
-        cls.contract_template1 = cls.env["contract.template"].create(
-            {"name": "Template 1"}
-        )
-        cls.contract_template2 = cls.env["contract.template"].create(
-            {
-                "name": "Template 2",
-                "contract_line_ids": [
-                    (
-                        0,
-                        0,
-                        {
-                            "product_id": cls.product2.id,
-                            "name": "Services from #START# to #END#",
-                            "quantity": 1,
-                            "uom_id": cls.product2.uom_id.id,
-                            "price_unit": 100,
-                            "discount": 50,
-                            "recurring_rule_type": "yearly",
-                            "recurring_interval": 1,
-                        },
-                    )
-                ],
-            }
-        )
-        cls.product1.with_company(cls.sale.company_id).write(
-            {
-                "is_contract": True,
-                "default_qty": 12,
-                "recurring_rule_type": "monthlylastday",
-                "recurring_invoicing_type": "post-paid",
-                "property_contract_template_id": cls.contract_template1.id,
-            }
-        )
-        cls.product2.with_company(cls.sale.company_id).write(
-            {
-                "is_contract": True,
-                "property_contract_template_id": cls.contract_template2.id,
-            }
-        )
-        cls.order_line1 = cls.sale.order_line.filtered(
-            lambda line: line.product_id == cls.product1
-        )
-        cls.order_line1.date_start = "2018-01-01"
-        cls.order_line1.product_uom_qty = 12
         pricelist = cls.sale.partner_id.property_product_pricelist.id
         cls.contract = cls.env["contract.contract"].create(
             {
diff --git a/product_contract_fixed_discount/README.rst b/product_contract_fixed_discount/README.rst
new file mode 100644
index 0000000000..03ba8b8b7f
--- /dev/null
+++ b/product_contract_fixed_discount/README.rst
@@ -0,0 +1,93 @@
+===========================================
+Recurring - Product Contract fixed discount
+===========================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:34f4982f97b150f5365c171821d166442237ab33192b3ad59fa3afaaeb0e8785
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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/17.0/product_contract_fixed_discount
+    :alt: OCA/contract
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/contract-17-0/contract-17-0-product_contract_fixed_discount
+    :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=17.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+Glue module betweens product_contract that generate contracts from Sale
+order, contract_fixed_discount that allows to manage discount with fixed
+amount and sale_fixed_discount that allows to manage discount with fixed
+amount.
+
+So this module propagate the fixed discount defined on sale order line
+to the fixed discount field on contract line.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/contract/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 <https://github.com/OCA/contract/issues/new?body=module:%20product_contract_fixed_discount%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* Pierre Verkest
+
+Contributors
+------------
+
+- `Foodles <https://www.foodles.co>`__:
+
+  - Damien Crier <damien.crier@foodles.co>
+  - Pierre Verkest <pierreverkest84@gmail.com>
+
+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.
+
+.. |maintainer-petrus-v| image:: https://github.com/petrus-v.png?size=40px
+    :target: https://github.com/petrus-v
+    :alt: petrus-v
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-petrus-v| 
+
+This module is part of the `OCA/contract <https://github.com/OCA/contract/tree/17.0/product_contract_fixed_discount>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/product_contract_fixed_discount/__init__.py b/product_contract_fixed_discount/__init__.py
new file mode 100644
index 0000000000..0650744f6b
--- /dev/null
+++ b/product_contract_fixed_discount/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/product_contract_fixed_discount/__manifest__.py b/product_contract_fixed_discount/__manifest__.py
new file mode 100644
index 0000000000..7aece72c64
--- /dev/null
+++ b/product_contract_fixed_discount/__manifest__.py
@@ -0,0 +1,21 @@
+# Copyright 2023 Foodles (https://www.foodles.com/)
+# @author Pierre Verkest <pierreverkest84@gmail.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+{
+    "name": "Recurring - Product Contract fixed discount",
+    "version": "17.0.1.0.0",
+    "category": "Contract Management",
+    "license": "AGPL-3",
+    "author": "Pierre Verkest, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/contract",
+    "depends": [
+        "product_contract",
+        "contract_fixed_discount",
+        "sale_fixed_discount",
+    ],
+    "data": [],
+    "installable": True,
+    "auto_install": True,
+    "application": False,
+    "maintainers": ["petrus-v"],
+}
diff --git a/product_contract_fixed_discount/models/__init__.py b/product_contract_fixed_discount/models/__init__.py
new file mode 100644
index 0000000000..8eb9d1d404
--- /dev/null
+++ b/product_contract_fixed_discount/models/__init__.py
@@ -0,0 +1 @@
+from . import sale_order_line
diff --git a/product_contract_fixed_discount/models/sale_order_line.py b/product_contract_fixed_discount/models/sale_order_line.py
new file mode 100644
index 0000000000..da40ca2892
--- /dev/null
+++ b/product_contract_fixed_discount/models/sale_order_line.py
@@ -0,0 +1,20 @@
+# Copyright 2023 Foodles (https://www.foodles.com/)
+# @author Pierre Verkest <pierreverkest84@gmail.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models
+
+
+class SaleOrderLine(models.Model):
+    _inherit = "sale.order.line"
+
+    def _prepare_contract_line_values(
+        self, contract, predecessor_contract_line_id=False
+    ):
+        contract_line_data = super()._prepare_contract_line_values(
+            contract, predecessor_contract_line_id=predecessor_contract_line_id
+        )
+        if self.discount_fixed:
+            contract_line_data["discount_fixed"] = self.discount_fixed
+            del contract_line_data["discount"]
+        return contract_line_data
diff --git a/product_contract_fixed_discount/pyproject.toml b/product_contract_fixed_discount/pyproject.toml
new file mode 100644
index 0000000000..4231d0cccb
--- /dev/null
+++ b/product_contract_fixed_discount/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/product_contract_fixed_discount/readme/CONTRIBUTORS.md b/product_contract_fixed_discount/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000000..9835ba764f
--- /dev/null
+++ b/product_contract_fixed_discount/readme/CONTRIBUTORS.md
@@ -0,0 +1,3 @@
+- [Foodles](https://www.foodles.co):
+  - Damien Crier \<damien.crier@foodles.co\>
+  - Pierre Verkest \<pierreverkest84@gmail.com\>
diff --git a/product_contract_fixed_discount/readme/DESCRIPTION.md b/product_contract_fixed_discount/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..c790e6b626
--- /dev/null
+++ b/product_contract_fixed_discount/readme/DESCRIPTION.md
@@ -0,0 +1,7 @@
+Glue module betweens product_contract that generate contracts from Sale
+order, contract_fixed_discount that allows to manage discount with fixed
+amount and sale_fixed_discount that allows to manage discount with fixed
+amount.
+
+So this module propagate the fixed discount defined on sale order line
+to the fixed discount field on contract line.
diff --git a/product_contract_fixed_discount/static/description/index.html b/product_contract_fixed_discount/static/description/index.html
new file mode 100644
index 0000000000..feb694979d
--- /dev/null
+++ b/product_contract_fixed_discount/static/description/index.html
@@ -0,0 +1,434 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>Recurring - Product Contract fixed discount</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="recurring-product-contract-fixed-discount">
+<h1 class="title">Recurring - Product Contract fixed discount</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:34f4982f97b150f5365c171821d166442237ab33192b3ad59fa3afaaeb0e8785
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.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/17.0/product_contract_fixed_discount"><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-17-0/contract-17-0-product_contract_fixed_discount"><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=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>Glue module betweens product_contract that generate contracts from Sale
+order, contract_fixed_discount that allows to manage discount with fixed
+amount and sale_fixed_discount that allows to manage discount with fixed
+amount.</p>
+<p>So this module propagate the fixed discount defined on sale order line
+to the fixed discount field on contract line.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/contract/issues">GitHub Issues</a>.
+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
+<a class="reference external" href="https://github.com/OCA/contract/issues/new?body=module:%20product_contract_fixed_discount%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>Pierre Verkest</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="https://www.foodles.co">Foodles</a>:<ul>
+<li>Damien Crier &lt;<a class="reference external" href="mailto:damien.crier&#64;foodles.co">damien.crier&#64;foodles.co</a>&gt;</li>
+<li>Pierre Verkest &lt;<a class="reference external" href="mailto:pierreverkest84&#64;gmail.com">pierreverkest84&#64;gmail.com</a>&gt;</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
+<p>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.</p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
+<p><a class="reference external image-reference" href="https://github.com/petrus-v"><img alt="petrus-v" src="https://github.com/petrus-v.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/contract/tree/17.0/product_contract_fixed_discount">OCA/contract</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/product_contract_fixed_discount/tests/__init__.py b/product_contract_fixed_discount/tests/__init__.py
new file mode 100644
index 0000000000..6f699d0d8b
--- /dev/null
+++ b/product_contract_fixed_discount/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_sale_order
diff --git a/product_contract_fixed_discount/tests/test_sale_order.py b/product_contract_fixed_discount/tests/test_sale_order.py
new file mode 100644
index 0000000000..e2b72dae01
--- /dev/null
+++ b/product_contract_fixed_discount/tests/test_sale_order.py
@@ -0,0 +1,33 @@
+# Copyright 2023 Foodles
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+
+from odoo.addons.product_contract.tests.common import CommonProductContractSaleOrderCase
+
+
+class TestSaleOrder(CommonProductContractSaleOrderCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.order_line1.discount_fixed = 11.0
+        cls.contract_template2.contract_line_ids.discount = 0
+        cls.contract_template2.contract_line_ids.discount_fixed = 50
+        cls.order_line2.discount = 0
+        cls.order_line2.discount_fixed = 22.0
+
+    def test_action_confirm(self):
+        """It should create a contract for each contract template used in
+        order_line with propagated fixed_discount"""
+        self.order_line1._compute_auto_renew()
+        self.sale.action_confirm()
+        contracts = self.sale.order_line.mapped("contract_id")
+        self.assertEqual(len(contracts), 2)
+        contract_line = self.order_line1.contract_id.contract_line_ids
+        self.assertEqual(contract_line.discount_fixed, 11)
+        self.assertEqual(contract_line.discount_fixed, 11)
+        self.assertEqual(
+            sorted(
+                self.order_line2.contract_id.contract_line_ids.mapped("discount_fixed")
+            ),
+            sorted([50, 22]),
+        )
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 0000000000..1a8271131a
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,2 @@
+odoo-addon-contract-fixed-discount @ git+https://github.com/OCA/contract.git@refs/pull/1253/head#subdirectory=contract_fixed_discount
+odoo-addon-contract  @ git+https://github.com/OCA/contract.git@refs/pull/1253/head#subdirectory=contract