From 1e8410729726b92f98eaf13161f71bbba1fb72bd Mon Sep 17 00:00:00 2001 From: jam-openerp Date: Thu, 25 Nov 2010 12:13:47 +0530 Subject: [PATCH 1/2] [BUG] lp:658126 - Fixed bzr revid: jam@tinyerp.com-20101125064347-vxgq1lxgjdxd7hdf --- addons/caldav/wizard/calendar_event_import.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py index 11f9f9b4afb..434904092e4 100644 --- a/addons/caldav/wizard/calendar_event_import.py +++ b/addons/caldav/wizard/calendar_event_import.py @@ -27,6 +27,7 @@ import time import tools import wizard import base64 +import logging class calendar_event_import(osv.osv_memory): """ @@ -56,7 +57,11 @@ class calendar_event_import(osv.osv_memory): id2 = data_obj._get_id(cr, uid, 'caldav', 'view_calendar_event_import_display') if id2: id2 = data_obj.browse(cr, uid, id2, context=context).res_id - vals = model_obj.import_cal(cr, uid, base64.decodestring(data['file_path']), context['active_id'], context) + vals = None + try: + vals = model_obj.import_cal(cr, uid, base64.decodestring(data['file_path']), context['active_id'], context) + except: + raise osv.except_osv(_('Warning !'),_('Invalid format of the ics, file can not be imported')) global cnt if vals: cnt = len(vals) From a0e5913d5c0af70596c601a209868b59d820a2c3 Mon Sep 17 00:00:00 2001 From: jam-openerp Date: Thu, 25 Nov 2010 15:14:59 +0530 Subject: [PATCH 2/2] [BUG] lp:680994 - Fixed bzr revid: jam@tinyerp.com-20101125094459-s5mlh7yjvup9u9h6 --- addons/project_long_term/project_long_term_view.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index eaaafe5090a..8c7595f24bc 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -376,7 +376,9 @@ res_model="project.task" src_model="project.phase" view_mode="tree,form" - context="{'search_default_phase_id': [active_id]}"/> + context="{'search_default_phase_id': [active_id]}" + domain="[('phase_id', '=', active_id)]" + />