summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Martinelli <nim@odoo.com>2018-06-04 14:56:25 +0200
committerNicolas Martinelli <nim-odoo@users.noreply.github.com>2018-06-05 08:38:38 +0200
commitd2b7be055ad3ca2223d4e8009388c80e5057dbf2 (patch)
tree162b8c7c9cd811b812d6275b8d77eff4daf5aa80
parent579f67166a25bd3b072edf92c24df99b3568eaf7 (diff)
[FIX] delivery: tracking reference
- Create a picking, set as 'Carrier': 'Free delivery charges' - Enter a 'Tracking Reference' - Validate the picking The tracking reference is removed. opw-1849279
-rw-r--r--addons/delivery/models/stock_picking.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py
index f839915a48d..be94eecfc51 100644
--- a/addons/delivery/models/stock_picking.py
+++ b/addons/delivery/models/stock_picking.py
@@ -164,7 +164,8 @@ class StockPicking(models.Model):
if self.carrier_id.free_over and self.sale_id and self.sale_id._compute_amount_total_without_delivery() >= self.carrier_id.amount:
res['exact_price'] = 0.0
self.carrier_price = res['exact_price']
- self.carrier_tracking_ref = res['tracking_number']
+ if res['tracking_number']:
+ self.carrier_tracking_ref = res['tracking_number']
order_currency = self.sale_id.currency_id or self.company_id.currency_id
msg = _("Shipment sent to carrier %s for shipping with tracking number %s<br/>Cost: %.2f %s") % (self.carrier_id.name, self.carrier_tracking_ref, self.carrier_price, order_currency.name)
self.message_post(body=msg)