diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 301780282e7..3ad3b3db5b0 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -410,6 +410,8 @@ property or property parameter."), return res cal = vobject.iCalendar() event = cal.add('vevent') + if not event_obj.date_deadline or not event_obj.date: + raise osv.except_osv(_('Warning !'),_("Couldn't Invite because date is not specified!")) event.add('created').value = ics_datetime(time.strftime('%Y-%m-%d %H:%M:%S')) event.add('dtstart').value = ics_datetime(event_obj.date) event.add('dtend').value = ics_datetime(event_obj.date_deadline) @@ -461,7 +463,6 @@ property or property parameter."), attendee_add.params['ROLE'] = [str(attendee.role)] attendee_add.params['RSVP'] = [str(attendee.rsvp)] attendee_add.value = 'MAILTO:' + (attendee.email or '') - res = cal.serialize() return res diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 6fcb8f72f82..d536ef02824 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -77,6 +77,7 @@ + diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py index 0b68d7f37ba..8fc7ffb310d 100644 --- a/addons/crm/wizard/crm_opportunity_to_phonecall.py +++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py @@ -137,7 +137,7 @@ class crm_opportunity2phonecall(osv.osv_memory): 'view_mode': 'tree,form', 'res_model': 'crm.phonecall', 'res_id' : new_case, - 'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar'), (False, 'graph')], + 'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar')], 'type': 'ir.actions.act_window', 'search_view_id': res['res_id'] }