summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Trigaux <mat@odoo.com>2016-01-20 19:42:47 +0530
committerMartin Trigaux <mat@odoo.com>2016-01-20 19:42:47 +0530
commit917f4e73c1a35bb4ba5ab4a38e4cdca8a87c3cce (patch)
treed988777d514d6065a6f2ef8ba8a3c1c9e1cd9165
parent889e556403ea5cd539f040ccf1ff6d959c6014a4 (diff)
[FIX] calendar: do not try to escape empty date
display_start may be False and crash
-rw-r--r--addons/calendar/calendar.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index 24f074a805c..9c8ec4d60a2 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -1124,7 +1124,8 @@ class calendar_event(osv.Model):
if r_date:
sort_fields['sort_start'] = r_date.strftime("%Y%m%d%H%M%S")
else:
- sort_fields['sort_start'] = browse_event['display_start'].replace(' ', '').replace('-', '')
+ display_start = browse_event['display_start']
+ sort_fields['sort_start'] = display_start and display_start.replace(' ', '').replace('-', '') or False
return sort_fields
def get_recurrent_ids(self, cr, uid, event_id, domain, order=None, context=None):