[16.0][FIX] sale_invoice_policy: if not order_id.invoice_policy_required, keep standard behaviour

sale_invoice_policy/models/sale_order.py

@@ -5,7 +5,6 @@
 
 
 class SaleOrder(models.Model):
-
     _inherit = "sale.order"
 
     invoice_policy = fields.Selection(

sale_invoice_policy/models/sale_order_line.py

@@ -7,9 +7,10 @@
 class SaleOrderLine(models.Model):
     _inherit = "sale.order.line"
 
-    def _get_order_lines_by_invoice_policy(self, invoice_policy):
+    def _get_required_order_lines_by_invoice_policy(self, invoice_policy):
         so_lines = self.filtered(
             lambda x, p=invoice_policy: x.order_id.invoice_policy == p
+            and x.order_id.invoice_policy_required
         ).with_prefetch()
         return so_lines
 
@@ -33,17 +34,13 @@ def _compute_qty_to_invoice(self):
         line_by_id = {line.id: line for line in self}
         done_lines = self.env["sale.order.line"]
         for invoice_policy in invoice_policies:
-            so_lines = self._get_order_lines_by_invoice_policy(invoice_policy)
-            so_lines._set_invoice_policy_on_product_templates(invoice_policy)
+            so_lines = self._get_required_order_lines_by_invoice_policy(invoice_policy)
             if so_lines:
                 done_lines |= so_lines
+                so_lines._set_invoice_policy_on_product_templates(invoice_policy)
                 super(SaleOrderLine, so_lines)._compute_qty_to_invoice()
                 for line in so_lines:
-                    # due to the change of context in compute methods,
-                    # assign the value in the modified context to self
                     line_by_id[line.id].qty_to_invoice = line.qty_to_invoice
-        # Not to break function if (it could not happen) some records
-        # were not in so_lines
         super(SaleOrderLine, self - done_lines)._compute_qty_to_invoice()
         return True
 
@@ -60,16 +57,12 @@ def _compute_invoice_status(self):
         line_by_id = {line.id: line for line in self}
         done_lines = self.env["sale.order.line"]
         for invoice_policy in invoice_policies:
-            so_lines = self._get_order_lines_by_invoice_policy(invoice_policy)
-            so_lines._set_invoice_policy_on_product_templates(invoice_policy)
-            done_lines |= so_lines
+            so_lines = self._get_required_order_lines_by_invoice_policy(invoice_policy)
             if so_lines:
+                done_lines |= so_lines
+                so_lines._set_invoice_policy_on_product_templates(invoice_policy)
                 super(SaleOrderLine, so_lines)._compute_invoice_status()
                 for line in so_lines:
-                    # due to the change of context in compute methods,
-                    # assign the value in the modified context to self
                     line_by_id[line.id].invoice_status = line.invoice_status
-        # Not to break function if (it could not happen) some records
-        # were not in so_lines
         super(SaleOrderLine, self - done_lines)._compute_invoice_status()
         return True

sale_invoice_policy/tests/test_sale_invoice_policy.py

@@ -26,6 +26,9 @@ def setUpClass(cls):
 
     def test_sale_order_invoice_order(self):
         """Test invoicing based on ordered quantities"""
+        settings = self.env["res.config.settings"].create({})
+        settings.sale_invoice_policy_required = True
+        settings.execute()
         so = self.env["sale.order"].create(
             {
                 "partner_id": self.env.ref("base.res_partner_2").id,
@@ -36,6 +39,9 @@ def test_sale_order_invoice_order(self):
                 "invoice_policy": "order",
             }
         )
+        so._compute_invoice_policy_required()
+        self.assertTrue(so.invoice_policy_required)
+        self.assertTrue(so.invoice_policy == "order")
 
         so.action_confirm()
 
@@ -56,6 +62,9 @@ def test_sale_order_invoice_order(self):
 
     def test_sale_order_invoice_deliver(self):
         """Test invoicing based on delivered quantities"""
+        settings = self.env["res.config.settings"].create({})
+        settings.sale_invoice_policy_required = True
+        settings.execute()
         so = self.env["sale.order"].create(
             {
                 "partner_id": self.env.ref("base.res_partner_2").id,
@@ -66,6 +75,9 @@ def test_sale_order_invoice_deliver(self):
                 ],
             }
         )
+        so._compute_invoice_policy_required()
+        self.assertTrue(so.invoice_policy_required)
+        self.assertTrue(so.invoice_policy == "delivery")
 
         so.action_confirm()