odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] sale_order_dates: cannot concatenate str and timedelta objects 

bzr revid: qdp-launchpad@openerp.com-20140415090248-9gixo6c7fngbw9s6
This commit is contained in:
Quentin (OpenERP) 2014-04-15 11:02:48 +02:00
parent 613901196b
commit d568c19f40
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/sale_order_dates/sale_order_dates.py
View File

@ -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: