[MERGE] merge with latest stable

[odoo/odoo.git] / addons / project_caldav / project_caldav.py

diff --git a/addons/project_caldav/project_caldav.py b/addons/project_caldav/project_caldav.py
index f1a4bc7..540ff91 100644 (file)
--- a/addons/project_caldav/project_caldav.py
+++ b/addons/project_caldav/project_caldav.py
@@ -57,9 +57,6 @@ class project_task(osv.osv):
         @return: Dictionary value which open Project Task form.
         """
 
-        if not context:
-            context = {}
-
         data_pool = self.pool.get('ir.model.data')
         value = {}
         task_form_id = data_pool.get_object(cr, uid, 'project', 'view_task_form2')
@@ -91,7 +88,7 @@ class project_task(osv.osv):
             context = {}
         ids = []
         for val in vals:
-            obj_tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+            obj_tm = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.project_time_mode_id
             if not val.get('planned_hours', False):
                 # 'Computes duration' in days
                 plan = 0.0
@@ -112,6 +109,8 @@ class project_task(osv.osv):
                 self.write(cr, uid, [exists], val)
                 ids.append(exists)
             else:
+                #set user_id with id, needed later
+                val.update({'user_id' : uid})
                 task_id = self.create(cr, uid, val)
                 ids.append(task_id)
         return ids