[MERGE] lp: 953006

bzr revid: qdp-launchpad@openerp.com-20120627135425-cs8q2cdsiarwvguw

diff --cc addons/project_timesheet/project_timesheet.py
index 31b169d,2cec9b9..565710f
--- 1/addons/project_timesheet/project_timesheet.py
--- 2/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@@ -168,11 -142,7 +168,11 @@@ class project_work(osv.osv)
                  vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
              if 'user_id' in vals:
                  vals_line['user_id'] = vals['user_id']
-                 result = self.get_user_related_details(cr, uid, vals['user_id'])
 -                        
++                result = self.get_user_related_details(cr, uid, vals.get('user_id', task.user_id.id))
 +                for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
 +                    if result.get(fld, False):
 +                        vals_line[fld] = result[fld]
 +
              if 'date' in vals:
                  vals_line['date'] = vals['date'][:10]
              if 'hours' in vals: