From ed1f081a9ec70d70708784cc9694bf6748379219 Mon Sep 17 00:00:00 2001 From: "atp (Open ERP)" Date: Fri, 31 Dec 2010 17:48:35 +0530 Subject: [PATCH 1/4] [FIX]: FIXed "Meeting Invitation" search view Problem. bzr revid: atp@tinyerp.co.in-20101231121835-bsg1qoumwtwntbnb --- addons/base_calendar/base_calendar.py | 3 ++- addons/base_calendar/base_calendar_view.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 301780282e7..aac2f947007 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 !'),_("You must enter Date")) 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 @@ + From 228a089fb1b4b14c17cc53ac1acc7abb0f0888c6 Mon Sep 17 00:00:00 2001 From: "atp (Open ERP)" Date: Tue, 11 Jan 2011 13:03:38 +0530 Subject: [PATCH 2/4] [FIX]: Uncheck find_all ressource in dynamic folder in Document Module. bzr revid: atp@tinyerp.co.in-20110111073338-eaj83u1hbjnl4q14 --- addons/document/document_directory.py | 5 +++++ addons/document/document_view.xml | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index 2a3f54f53ba..2e11d534b6a 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -160,6 +160,11 @@ class document_directory(osv.osv): def __init__(self, *args, **kwargs): super(document_directory, self).__init__(*args, **kwargs) + def onchange_type_id(self, cr, uid, ids, type): + if type == "ressource": + self.write(cr, uid, ids, {'resource_find_all': False}) + return {} + def onchange_content_id(self, cr, uid, ids, ressource_type_id): return {} diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 6f82dde0a4f..c4e2a009655 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -78,7 +78,7 @@ - + @@ -93,9 +93,8 @@ - + -