diff --git a/addons/sale_stock/tests/test_create_perf.py b/addons/sale_stock/tests/test_create_perf.py
index c6bc9d0f4e6..fc77214da3d 100644
--- a/addons/sale_stock/tests/test_create_perf.py
+++ b/addons/sale_stock/tests/test_create_perf.py
@@ -2,8 +2,11 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import logging
+import random
 import time
 
+from odoo.fields import Command
+
 from odoo.tests import common, tagged
 from odoo.tests.common import users, warmup
 
@@ -34,7 +37,82 @@ class TestPERF(common.TransactionCase):
 
     @users('admin')
     @warmup
-    def test_sales_orders_batch_creation_perf(self):
+    def test_empty_sale_order_creation_perf(self):
+        with self.assertQueryCount(admin=33):
+            self.env['sale.order'].create({
+                'partner_id': self.partners[0].id,
+                'user_id': self.salesmans[0].id,
+            })
+
+    @users('admin')
+    @warmup
+    def test_empty_sales_orders_batch_creation_perf(self):
+        # 1 SO insert, 2 SOL insert, 1 SO sequence fetch, 1 warehouse fetch, 3 followers queries ?
+        with self.assertQueryCount(admin=41):
+            self.env['sale.order'].create([{
+                'partner_id': self.partners[0].id,
+                'user_id': self.salesmans[0].id,
+            } for i in range(2)])
+
+    @users('admin')
+    @warmup
+    def test_dummy_sales_orders_batch_creation_perf(self):
+        """ Dummy SOlines (notes/sections) should not add any custom queries other than their insert"""
+        # + 4 SOL insert
+        with self.assertQueryCount(admin=45):
+            self.env['sale.order'].create([{
+                'partner_id': self.partners[0].id,
+                'user_id': self.salesmans[0].id,
+                "order_line": [
+                    (0, 0, {"display_type": "line_note", "name": "NOTE"}),
+                    (0, 0, {"display_type": "line_section", "name": "SECTION"})
+                ]
+            } for i in range(2)])
+
+    @users('admin')
+    @warmup
+    def test_light_sales_orders_batch_creation_perf_without_taxes(self):
+        self.products[0].taxes_id = [Command.set([])]
+        with self.assertQueryCount(admin=57):
+            self.env['sale.order'].create([{
+                'partner_id': self.partners[0].id,
+                'user_id': self.salesmans[0].id,
+                "order_line": [
+                    (0, 0, {"display_type": "line_note", "name": "NOTE"}),
+                    (0, 0, {"display_type": "line_section", "name": "SECTION"}),
+                    (0, 0, {'product_id': self.products[0].id})
+                ]
+            } for i in range(2)])
+
+    @users('admin')
+    @warmup
+    def test_light_sales_orders_batch_creation_perf(self):
+        with self.assertQueryCount(admin=67):
+            self.env['sale.order'].create([{
+                'partner_id': self.partners[0].id,
+                'user_id': self.salesmans[0].id,
+                "order_line": [
+                    (0, 0, {"display_type": "line_note", "name": "NOTE"}),
+                    (0, 0, {"display_type": "line_section", "name": "SECTION"}),
+                    (0, 0, {'product_id': self.products[0].id})
+                ]
+            } for i in range(2)])
+
+    @users('admin')
+    @warmup
+    def test_complex_sales_orders_batch_creation_perf(self):
+        self._test_complex_sales_orders_batch_creation_perf(1100)
+
+    @users('admin')
+    @warmup
+    def test_complex_sales_orders_batch_creation_perf_with_discount_computation(self):
+        """Cover the "complex" logic triggered inside the `_compute_discount`"""
+        self.env['product.pricelist'].search([]).discount_policy = 'without_discount'
+        self.env.user.groups_id += self.env.ref('product.group_discount_per_so_line')
+
+        self._test_complex_sales_orders_batch_creation_perf(2093)
+
+    def _test_complex_sales_orders_batch_creation_perf(self, query_count):
         MSG = "Model %s, %i records, %s, time %.2f"
 
         vals_list = [{
@@ -47,10 +125,36 @@ class TestPERF(common.TransactionCase):
             ],
         } for i in range(self.ENTITIES)]
 
-        with self.assertQueryCount(admin=1100):
+        with self.assertQueryCount(admin=query_count):
             t0 = time.time()
             self.env["sale.order"].create(vals_list)
             t1 = time.time()
             _logger.info(MSG, 'sale.order', self.ENTITIES, "BATCH", t1 - t0)
             self.env.cr.flush()
             _logger.info(MSG, 'sale.order', self.ENTITIES, "FLUSH", time.time() - t1)
+
+    @users('admin')
+    @warmup
+    def test_randomized_solines_qties(self):
+        """Make sure the price and discounts computation are complexified
+        and do not gain from any prefetch/batch gains during the price computation
+        """
+        # Enable discounts
+        self.env['product.pricelist'].search([]).discount_policy = 'without_discount'
+        self.env.user.groups_id += self.env.ref('product.group_discount_per_so_line')
+
+        vals_list = [{
+            "partner_id": self.partners[i].id,
+            "user_id": self.salesmans[i % 2].id,
+            "order_line": [
+                (0, 0, {"display_type": "line_note", "name": "NOTE"})
+            ] + [
+                (0, 0, {
+                    'product_id': product.id,
+                    'product_uom_qty': random.random()
+                }) for product in self.products
+            ],
+        } for i in range(self.ENTITIES)]
+
+        with self.assertQueryCount(admin=2141):
+            self.env["sale.order"].create(vals_list)