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

[Merge] Merge with rco's branch to make all-day events start at 00:00:00 in the user's timezone. 

bzr revid: mdi@tinyerp.com-20120718050346-dgz5epj8fufn1csq
This commit is contained in:
Divyesh Makwana (Open ERP) 2012-07-18 10:33:46 +05:30
parent cffd51de3a c2e7e54fe3
commit 44378caf74
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
addons/base_calendar/base_calendar.py
View File

@ -941,16 +941,19 @@ class calendar_event(osv.osv):
duration = 1.00
value['duration'] = duration
if allday: # For all day event
value = {'duration': 8.0}
duration = 8.0
if start_date:
start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
start_date = datetime.strftime(datetime(start.year, start.month, start.day, 0,0,0), "%Y-%m-%d %H:%M:%S")
value['date'] = start_date
start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
if allday: # For all day event
duration = 24.0
value['duration'] = duration
# change start_date's time to 00:00:00 in the user's timezone
user = self.pool.get('res.users').browse(cr, uid, uid)
tz = pytz.timezone(user.context_tz) if user.context_tz else pytz.utc
start = pytz.utc.localize(start).astimezone(tz) # convert start in user's timezone
start = start.replace(hour=0, minute=0, second=0) # change start's time to 00:00:00
start = start.astimezone(pytz.utc) # convert start back to utc
start_date = start.strftime("%Y-%m-%d %H:%M:%S")
value['date'] = start_date
if end_date and not duration:
end = datetime.strptime(end_date, "%Y-%m-%d %H:%M:%S")
diff = end - start