From 621dac802ddddc3a4dd58f7370250386e1031598 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 9 Jan 2020 15:22:35 +0000
Subject: [PATCH] [FIX] delivery: Delivery Order Adding Freight Cost W/O Markup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Steps to reproduce the bug:
- Let's consider a delivery method DM with fixed price of 10€ and a margin of 20%
- Let's consider a storable product P
- Create a SO for P and get the rate (12€) but don't add it on the SO
- Confirm the SO and process the delivery
Bug:
A SO line was created for the freight cost without the margin. So it was 10€
instead of 12€.
opw:2144894
closes odoo/odoo#43206
X-original-commit: f6ce45fc52da449df240bce467319e6110012e4c
Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
---
addons/delivery/models/stock_picking.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py
index 9b15974a9381..be29fe890514 100644
--- a/addons/delivery/models/stock_picking.py
+++ b/addons/delivery/models/stock_picking.py
@@ -170,12 +170,13 @@ class StockPicking(models.Model):
sale_order = self.sale_id
if sale_order and self.carrier_id.invoice_policy == 'real' and self.carrier_price:
delivery_lines = sale_order.order_line.filtered(lambda l: l.is_delivery and l.currency_id.is_zero(l.price_unit) and l.product_id == self.carrier_id.product_id)
+ carrier_price = self.carrier_price * (1.0 + (float(self.carrier_id.margin) / 100.0))
if not delivery_lines:
- sale_order._create_delivery_line(self.carrier_id, self.carrier_price)
+ sale_order._create_delivery_line(self.carrier_id, carrier_price)
else:
delivery_line = delivery_lines[0]
delivery_line[0].write({
- 'price_unit': self.carrier_price,
+ 'price_unit': carrier_price,
# remove the estimated price from the description
'name': sale_order.carrier_id.with_context(lang=self.partner_id.lang).name,
})
--
GitLab