From 77f0962743617d97131b0216b8d8fca4ab7afd0f Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 15 Jul 2016 16:49:34 +0200 Subject: [PATCH] make sure tracking number is always set, even if there is none Depending on the product used, there is no tracking number. However, the odoo shipping infrastructure expects us to return one. Also, add a bogus space at the beginning of the tracking number, as odoo shipping infrastructure removes the first character ?!? --- models/dp_delivery_carrier.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/models/dp_delivery_carrier.py b/models/dp_delivery_carrier.py index a3236ee..4fafa92 100644 --- a/models/dp_delivery_carrier.py +++ b/models/dp_delivery_carrier.py @@ -89,10 +89,13 @@ class DPDeliveryCarrier(models.Model): r = im.checkoutPNG() voucher = r.shoppingCart.voucherList.voucher[0] filename = 'DP'+voucher.trackId+'.png' - result = { 'exact_price': im.compute_total(), + tracking_nr = ' ' + if voucher.trackId: + tracking_nr += voucher.trackId + result = { 'exact_price': im.compute_total()/100, 'weight': service.weight, 'date_delivery': None, - 'tracking_number': voucher.trackId, + 'tracking_number': tracking_nr, 'voucher_id' : voucher.voucherId, 'order_id' : r.shoppingCart.shopOrderId, 'wallet_balance': r.walletBalance,