openerp-dev-web team mailing list archive

[jam-openerp <jam@xxxxxxxxxxx>]

jam-openerp has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  Harry (Open ERP) (hmo-tinyerp)


Bug fix:
+ bug lp:658126
+ bug lp:680994
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons1/+merge/41839
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons1.

=== modified file 'caldav/wizard/calendar_event_import.py'
--- caldav/wizard/calendar_event_import.py	2010-10-14 11:42:16 +0000
+++ caldav/wizard/calendar_event_import.py	2010-11-25 10:03:57 +0000
@@ -27,6 +27,7 @@
 import tools
 import wizard
 import base64
+import logging
 
 class calendar_event_import(osv.osv_memory):
     """
@@ -56,7 +57,11 @@
             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)

=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml	2010-11-03 09:22:21 +0000
+++ project_long_term/project_long_term_view.xml	2010-11-25 10:03:57 +0000
@@ -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)]"
+        />
 
     <act_window
         context="{'search_default_project_id': [active_id]}"