[16.0] Fix build

product_abc_classification/models/abc_classification_profile.py

@@ -128,10 +128,8 @@ def _auto_apply_computed_value_for_product_levels(self):
                 },
             )
             level_ids.extend(r[0] for r in self.env.cr.fetchall())
-        self.env["abc.classification.product.level"].invalidate_cache(
-            ["manual_level_id"], level_ids
-        )
         modified_levels = self.env["abc.classification.product.level"].browse(level_ids)
+        modified_levels.invalidate_recordset(fnames=["manual_level_id"])
         # mark field as modified and trigger recompute of dependent fields.
         modified_levels.modified(["manual_level_id"])
         modified_levels._recompute_recordset()

product_abc_classification/tests/test_abc_classification_product_level.py

@@ -4,6 +4,7 @@
 from psycopg2 import IntegrityError
 
 from odoo.exceptions import ValidationError
+from odoo.tools import mute_logger
 
 from .common import ABCClassificationLevelCase
 
@@ -137,6 +138,7 @@ def test_02(self):
         self.assertEqual(self.product_level.level_id, self.classification_level_a)
         self.assertFalse(self.product_level.flag)
 
+    @mute_logger("odoo.sql_db")
     def test_03(self):
         """
         Data:

product_pricelist_simulation/wizards/wizard_preview_pricelist.py

@@ -100,7 +100,5 @@ class PricelistSimulationLine(models.TransientModel):
     )
     price = fields.Monetary(
         string="Unit Price",
-        digits="Price",
         readonly=True,
-        currency_field="currency_id",
     )

product_pricelist_simulation_margin/wizards/wizard_preview_pricelist.py

@@ -76,7 +76,6 @@ class PricelistSimulationLine(models.TransientModel):
 
     margin = fields.Monetary(
         store=True,
-        digits="Price",
         readonly=True,
     )
 

product_supplierinfo_for_customer/models/product_product.py

@@ -130,10 +130,20 @@ def _select_customerinfo(
             params = dict()
         params.update({"partner_id": partner.id})
         domain = self._prepare_domain_customerinfo(params)
-        res = (
-            self.env["product.customerinfo"]
-            .search(domain)
-            .sorted(lambda s: (s.sequence, s.min_qty, s.price, s.id))
+        # Search for customerinfo records based on the domain
+        any_match = self.env["product.customerinfo"].search(
+            domain, order="sequence,min_qty,price,id"
         )
-        res_1 = res.sorted("product_tmpl_id")[:1]
-        return res_1
+        first_template_match = None
+        # return the first customer_info matching the variant
+        # otherwise the first one matching the template
+        for customer_info in any_match:
+            if customer_info.product_id == self:
+                return customer_info
+            if (
+                not customer_info.product_id
+                and not first_template_match
+                and customer_info.product_tmpl_id == self.product_tmpl_id
+            ):
+                first_template_match = customer_info
+        return first_template_match