Merge PR #3744 into 16.0

Signed-off-by pedrobaeza

Author: OCA-git-bot

sale_pricelist_from_commitment_date/models/product_pricelist.py

@@ -13,3 +13,11 @@ def _get_product_rule(self, product, quantity, uom=None, date=False, **kwargs):
         if force_pricelist_date:
             date = force_pricelist_date
         return super()._get_product_rule(product, quantity, uom, date, **kwargs)
+
+    def _compute_price_rule(self, products, quantity, uom=None, date=False, **kwargs):
+        force_pricelist_date = self.env.context.get("force_pricelist_date")
+        if force_pricelist_date:
+            date = force_pricelist_date
+        return super()._compute_price_rule(
+            products, quantity, uom=uom, date=date, **kwargs
+        )

sale_pricelist_from_commitment_date/tests/test_pricelist_from_commitment_date.py

@@ -100,6 +100,16 @@ def test_00_pricelist(self):
         self.assertEqual(order_line.price_unit, product.list_price)
         # Test with commitment date
         sale.commitment_date = "2020-03-08"
+        self.assertEqual(
+            sale.pricelist_id.with_context(
+                force_pricelist_date=sale.commitment_date
+            )._compute_price_rule(product, 1.0, date=order_line.order_id.date_order)[
+                product.id
+            ][
+                0
+            ],
+            10,
+        )
         self.assertEqual(order_line.price_unit, 10)
         sale.commitment_date = "2020-03-12"
         self.assertEqual(order_line.price_unit, 20)