From d568c19f40ffe025efc0bb5833e755ef4253e7ed Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 15 Apr 2014 11:02:48 +0200 Subject: [PATCH] [FIX] sale_order_dates: cannot concatenate str and timedelta objects bzr revid: qdp-launchpad@openerp.com-20140415090248-9gixo6c7fngbw9s6 --- addons/sale_order_dates/sale_order_dates.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py index aa7fc5c998b..cd357380490 100644 --- a/addons/sale_order_dates/sale_order_dates.py +++ b/addons/sale_order_dates/sale_order_dates.py @@ -32,9 +32,8 @@ class sale_order_dates(osv.osv): def copy(self, cr, uid, id, default=None, context=None): """Don't copy the requested date along with the Sales Order""" default = dict(default or {}, requested_date=False) - return super(sale_order_dates, self).copy(cr, uid, id, default=default, - context=context) - + return super(sale_order_dates, self).copy(cr, uid, id, default=default, context=context) + def _get_date_planned(self, cr, uid, order, line, start_date, context=None): """Compute the expected date from the requested date, not the order date""" if order and order.requested_date: @@ -66,8 +65,9 @@ class sale_order_dates(osv.osv): dates_list = [] for order in self.browse(cr, uid, ids, context=context): dates_list = [] + order_datetime = datetime.strptime(order.date_order, DEFAULT_SERVER_DATETIME_FORMAT) for line in order.order_line: - dt = order.date_order + timedelta(days=line.delay or 0.0) + dt = order_datetime + timedelta(days=line.delay or 0.0) dt_s = dt.strftime(DEFAULT_SERVER_DATE_FORMAT) dates_list.append(dt_s) if dates_list: