From 9fb2d415e84d84d4bfa67ae58609c59fd7e23b57 Mon Sep 17 00:00:00 2001 From: "Anita (anko)" Date: Fri, 2 Feb 2024 14:56:10 +0000 Subject: [PATCH] [FIX] delivery: discount pricelist bug If user created pricelist which applied discount on fixed prize delivery and set the discount visibilty to be shown in sale order, the discount would be applied twice. Due to stable version limitation, the visibility of discount on sale order for pricelist discount for delivery is removed. opw-3517879 closes odoo/odoo#154663 X-original-commit: f96ce5102aea5651710bb5bf50903b1c1d4f101e Signed-off-by: Victor Feyens (vfe) Signed-off-by: anko-odoo --- addons/delivery/models/sale_order_line.py | 5 +++++ addons/delivery/tests/test_delivery_cost.py | 1 + 2 files changed, 6 insertions(+) diff --git a/addons/delivery/models/sale_order_line.py b/addons/delivery/models/sale_order_line.py index 1864ebc1572..f08305b0859 100644 --- a/addons/delivery/models/sale_order_line.py +++ b/addons/delivery/models/sale_order_line.py @@ -46,3 +46,8 @@ class SaleOrderLine(models.Model): undeletable_lines = super()._check_line_unlink() return undeletable_lines.filtered(lambda line: not line.is_delivery) + + def _compute_pricelist_item_id(self): + delivery_lines = self.filtered('is_delivery') + super(SaleOrderLine, self - delivery_lines)._compute_pricelist_item_id() + delivery_lines.pricelist_item_id = False diff --git a/addons/delivery/tests/test_delivery_cost.py b/addons/delivery/tests/test_delivery_cost.py index 92a1d965885..afadffd40ac 100644 --- a/addons/delivery/tests/test_delivery_cost.py +++ b/addons/delivery/tests/test_delivery_cost.py @@ -168,6 +168,7 @@ class TestDeliveryCost(common.TransactionCase): 'applied_on': '0_product_variant', 'product_id': self.normal_delivery.product_id.id, })], + 'discount_policy': 'without_discount', }) # Create sales order with Normal Delivery Charges