19.0 vanilla

odoo-bringout-oca-ocb-sale_loyalty/sale_loyalty/tests/test_sale_invoicing.py

@@ -1,10 +1,9 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.addons.sale_loyalty.tests.common import TestSaleCouponCommon
-from odoo.exceptions import UserError
 from odoo.tests import tagged
 
+from odoo.addons.sale_loyalty.tests.common import TestSaleCouponCommon
+
 
 @tagged('post_install', '-at_install')
 class TestSaleInvoicing(TestSaleCouponCommon):
@@ -50,17 +49,19 @@ class TestSaleInvoicing(TestSaleCouponCommon):
 
         order.action_confirm()
         invoiceable_lines = order._get_invoiceable_lines()
-        # Product was not delivered, we cannot invoice
-        # the product line nor the promotion line
-        order._compute_invoice_status()
+        # Product was not delivered, the order invoice status is 'No' as invoicing it should not be
+        # promoted, but the reward line should still be invoiceable, if users wants to invoice it
         self.assertEqual(order.invoice_status, 'no')
+        self.assertEqual(len(invoiceable_lines), 1)
+
+        inv = order._create_invoices()
+        self.assertEqual(len(inv.invoice_line_ids), 1)
+        invoiceable_lines = order._get_invoiceable_lines()
         self.assertEqual(len(invoiceable_lines), 0)
-        with self.assertRaises(UserError):
-            order._create_invoices()
+        inv.button_cancel()
 
         order.order_line[0].qty_delivered = 1
         # Product is delivered, the two lines can be invoiced.
-        order._compute_invoice_status()
         self.assertEqual(order.invoice_status, 'to invoice')
         invoiceable_lines = order._get_invoiceable_lines()
         self.assertEqual(order.order_line, invoiceable_lines)