projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
30ddb67
)
[FIX] calendar.read: do not re-compute `display_time` for virtual calendar ID if...
author
Olivier Dony
<odo@openerp.com>
Tue, 5 Aug 2014 15:40:22 +0000
(17:40 +0200)
committer
Olivier Dony
<odo@openerp.com>
Thu, 7 Aug 2014 16:03:08 +0000
(18:03 +0200)
addons/calendar/calendar.py
patch
|
blob
|
history
diff --git
a/addons/calendar/calendar.py
b/addons/calendar/calendar.py
index
6fa9034
..
150ec77
100644
(file)
--- a/
addons/calendar/calendar.py
+++ b/
addons/calendar/calendar.py
@@
-1597,7
+1597,8
@@
class calendar_event(osv.Model):
res['start_datetime'] = ls[1]
res['stop_datetime'] = ls[2]
- res['display_time'] = self._get_display_time(cr, uid, ls[1], ls[2], res['duration'], res['allday'], context=context)
+ if 'display_time' in fields:
+ res['display_time'] = self._get_display_time(cr, uid, ls[1], ls[2], res['duration'], res['allday'], context=context)
res['id'] = calendar_id
result.append(res)