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

[FIX] purchase, sale_stock: fix computation of date_planned when no timezone is defined for the user 

bzr revid: qdp-launchpad@openerp.com-20130409122530-svv1kpk57s2nrsa9
This commit is contained in:
Quentin (OpenERP) 2013-04-09 14:25:30 +02:00
parent 6fe10fc8e5 a7bf53ebaa
commit 8c8bfd706b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/purchase/purchase.py
View File

@ -604,7 +604,7 @@ class purchase_order(osv.osv):
:return: UTC datetime string for server-side use
"""
# TODO: move to fields.datetime in server after 7.0
user_datetime = datetime.strptime(userdate, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(hours=12.0)
user_date = datetime.strptime(userdate, DEFAULT_SERVER_DATE_FORMAT)
if context and context.get('tz'):
tz_name = context['tz']
else:
@ -612,10 +612,11 @@ class purchase_order(osv.osv):
if tz_name:
utc = pytz.timezone('UTC')
context_tz = pytz.timezone(tz_name)
user_datetime = user_date + relativedelta(hours=12.0)
local_timestamp = context_tz.localize(user_datetime, is_dst=False)
user_datetime = local_timestamp.astimezone(utc)
return user_datetime.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
return userdate
return user_date.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
def _prepare_order_picking(self, cr, uid, order, context=None):
return {

5
addons/sale_stock/sale_stock.py
View File

@ -243,7 +243,7 @@ class sale_order(osv.osv):
:return: UTC datetime string for server-side use
"""
# TODO: move to fields.datetime in server after 7.0
user_datetime = datetime.strptime(userdate, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(hours=12.0)
user_date = datetime.strptime(userdate, DEFAULT_SERVER_DATE_FORMAT)
if context and context.get('tz'):
tz_name = context['tz']
else:
@ -251,10 +251,11 @@ class sale_order(osv.osv):
if tz_name:
utc = pytz.timezone('UTC')
context_tz = pytz.timezone(tz_name)
user_datetime = user_date + relativedelta(hours=12.0)
local_timestamp = context_tz.localize(user_datetime, is_dst=False)
user_datetime = local_timestamp.astimezone(utc)
return user_datetime.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
return userdate
return user_date.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
# if mode == 'finished':
# returns True if all lines are done, False otherwise