From 6de4c3eb3ab87a7de1e048b6e72e54e52d13188b Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Thu, 28 Oct 2010 14:09:20 +0200 Subject: [PATCH] [FIX] base_calendar: use 'onchange_dates' instead of 'onchange_allday' since it also returns duration bzr revid: olt@tinyerp.com-20101028120920-qb6mg4oxyn8df9x7 --- addons/base_calendar/base_calendar.py | 10 +++++++++- addons/base_calendar/base_calendar_view.xml | 2 +- addons/crm/crm_meeting_view.xml | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index dfbdc745613..c3aa7bb8720 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -916,7 +916,7 @@ class calendar_event(osv.osv): return [(x.lower(), x) for x in pytz.all_timezones] def onchange_allday(self, cr, uid, ids, allday, context=None): - """Sets duration as 24 Hours if event is selcted for all day + """Sets duration as 24 Hours if event is selected for all day @param self: The object pointer @param cr: the current row, from the database cursor, @param uid: the current user’s ID for security checks, @@ -1630,6 +1630,14 @@ true, it will allow you to hide the event alarm information without removing it. if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'): vals['vtimezone'] = vals['vtimezone'][40:] + updated_vals = self.onchange_dates(cr, uid, [], + vals.get('date', False), + vals.get('duration', False), + vals.get('date_deadline', False), + vals.get('allday', False), + context=context) + vals.update(updated_vals.get('value', {})) + res = super(calendar_event, self).create(cr, uid, vals, context) alarm_obj = self.pool.get('res.alarm') alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context) diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 9f27e79d5a5..e9dbd2aa297 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -229,7 +229,7 @@ - + diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index a028e3e0e64..12f0a3f59cc 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -32,7 +32,7 @@ - +