[FIX] product_pricelist_alternative: No alternative price in waterfal…

…l pricelists
OCA · Oct 10, 2024 · 503ccce · 503ccce
1 parent 8cf9687
commit 503ccce
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 5 deletions.
diff --git a/product_pricelist_alternative/models/product_pricelist.py b/product_pricelist_alternative/models/product_pricelist.py
@@ -61,7 +61,9 @@ def _compute_price_rule(self, products, qty, uom=None, date=False, **kwargs):
 
         # In some contexts we want to ignore alternative pricelists
         # and return the original price
-        if self.env.context.get("skip_alternative_pricelist", False):
+        if self.env.context.get(
+            "skip_alternative_pricelist", False
+        ) or self.env.context.get("based_on_other_pricelist", False):
             return res
 
         for product in products:

diff --git a/product_pricelist_alternative/models/product_pricelist_item.py b/product_pricelist_alternative/models/product_pricelist_item.py
@@ -15,3 +15,8 @@ class PricelistItem(models.Model):
         default="use_lower_price",
         required=True,
     )
+
+    def _compute_price(self, product, quantity, uom, date, currency=None):
+        if self.compute_price == "formula" and self.base == "pricelist":
+            self = self.with_context(based_on_other_pricelist=True)
+        return super()._compute_price(product, quantity, uom, date, currency)
diff --git a/product_pricelist_alternative/tests/common.py b/product_pricelist_alternative/tests/common.py
@@ -22,7 +22,7 @@ def setUpClass(cls):
 
         cls.alternative_pricelist_01 = cls.env["product.pricelist"].create(
             {
-                "name": "Alternative pricelist 01",
+                "name": "Alternative pricelist_01",
                 "item_ids": [
                     Command.create(
                         {
@@ -37,7 +37,7 @@ def setUpClass(cls):
         )
         cls.alternative_pricelist_02 = cls.env["product.pricelist"].create(
             {
-                "name": "Alternative pricelist 02",
+                "name": "Alternative alternative_pricelist_02",
                 "item_ids": [
                     Command.create(
                         {
@@ -51,9 +51,25 @@ def setUpClass(cls):
             }
         )
 
+        cls.alternative_pricelist_03 = cls.env["product.pricelist"].create(
+            {
+                "name": "Alternative alternative_pricelist_03",
+                "item_ids": [
+                    Command.create(
+                        {
+                            "compute_price": "fixed",
+                            "product_id": cls.usb_adapter.id,
+                            "applied_on": "0_product_variant",
+                            "fixed_price": 110,
+                        }
+                    ),
+                ],
+            }
+        )
+
         cls.pricelist01 = cls.env["product.pricelist"].create(
             {
-                "name": "Sale pricelist",
+                "name": "Sale pricelist01",
                 "item_ids": [
                     Command.create(
                         {
@@ -86,7 +102,7 @@ def setUpClass(cls):
 
         cls.pricelist02 = cls.env["product.pricelist"].create(
             {
-                "name": "Sale pricelist",
+                "name": "Sale pricelist02",
                 "item_ids": [
                     Command.create(
                         {
@@ -102,3 +118,22 @@ def setUpClass(cls):
                 ],
             }
         )
+
+        cls.pricelist03 = cls.env["product.pricelist"].create(
+            {
+                "name": "Sale pricelist03",
+                "item_ids": [
+                    Command.create(
+                        {
+                            "compute_price": "formula",
+                            "base": "pricelist",
+                            "base_pricelist_id": cls.pricelist01.id,
+                            "applied_on": "3_global",
+                        }
+                    ),
+                ],
+                "alternative_pricelist_ids": [
+                    (4, cls.alternative_pricelist_03.id),
+                ],
+            }
+        )
diff --git a/product_pricelist_alternative/tests/test_pricelist_alternative.py b/product_pricelist_alternative/tests/test_pricelist_alternative.py
@@ -56,6 +56,11 @@ def test_product_price_considering_alternative_pricelist_with_lower_price(self):
             result[self.usb_adapter.id][1], self.pricelist02.item_ids[0].id
         )
 
+    def test_product_price_formula_based_on_other_price(self):
+        """Test that pricelists with formula based on other pricelist
+        does not take alternative pricelists into account"""
+        self.assertEqual(self.pricelist03._get_product_price(self.usb_adapter, 1.0), 95)
+
     def test_product_price_ignore_alternative_pricelist(self):
         """Test that the product price ignore alternative pricelist"""