[17.0][FIX] sale_invoice_policy: invoice policy

sale_invoice_policy/models/sale_order_line.py

@@ -18,7 +18,6 @@ def _compute_qty_to_invoice(self):
         other_lines = self.filtered(
             lambda line: line.product_id.type == "service"
             or not line.order_id.invoice_policy
-            or not line.order_id.invoice_policy_required
         )
         super(SaleOrderLine, other_lines)._compute_qty_to_invoice()
         for line in self - other_lines:
@@ -44,7 +43,6 @@ def _compute_untaxed_amount_to_invoice(self):
             or not line.order_id.invoice_policy
             or line.order_id.invoice_policy == line.product_id.invoice_policy
             or line.state not in ["sale", "done"]
-            or not line.order_id.invoice_policy_required
         )
         super(SaleOrderLine, other_lines)._compute_untaxed_amount_to_invoice()
         for line in self - other_lines:

sale_invoice_policy/tests/test_sale_invoice_policy.py

@@ -123,3 +123,34 @@ def test_settings(self):
         )
         self.assertEqual(so.invoice_policy, "order")
         self.assertTrue(so.invoice_policy_required)
+
+    def test_sale_order_invoice_order_when_policy_is_not_required(self):
+        """Test invoicing based on ordered qty when invoice policy is not required."""
+        settings = self.env["res.config.settings"].create({})
+        settings.sale_invoice_policy_required = False
+        settings.execute()
+        so = self.env["sale.order"].create(
+            {
+                "partner_id": self.env.ref("base.res_partner_2").id,
+                "order_line": [
+                    (0, 0, {"product_id": self.product.id, "product_uom_qty": 2.0}),
+                    (0, 0, {"product_id": self.product2.id, "product_uom_qty": 3.0}),
+                ],
+                "invoice_policy": "order",
+            }
+        )
+        self.assertFalse(so.invoice_policy_required)
+        self.assertTrue(so.invoice_policy == "order")
+        so.action_confirm()
+        self.assertEqual(len(so.picking_ids), 1)
+        picking = so.picking_ids
+        picking.action_assign()
+        self.assertEqual(picking.state, "assigned")
+        so_line = so.order_line[0]
+        self.assertEqual(so_line.qty_to_invoice, 2)
+        self.assertEqual(so_line.invoice_status, "to invoice")
+        self.assertEqual(so_line.product_id.invoice_policy, "order")
+        so_line = so.order_line[1]
+        self.assertEqual(so_line.qty_to_invoice, 3)
+        self.assertEqual(so_line.invoice_status, "to invoice")
+        self.assertEqual(so_line.product_id.invoice_policy, "order")