Merge remote-tracking branch 'odoo/7.0' into 7.0

diff --cc addons/mrp/mrp.py
Simple merge

diff --cc addons/project_timesheet/project_timesheet.py
index 4c929b1,6cbb4e8..ce92ef9
--- 1/addons/project_timesheet/project_timesheet.py
--- 2/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@@ -252,9 -274,16 +274,16 @@@ class task(osv.osv)
                          if vals.get('project_id',False):
                              vals_line['account_id'] = acc_id
                          if vals.get('name',False):
 -                            vals_line['name'] = '%s: %s' % (tools.ustr(vals['name']), tools.ustr(task_work.name) or '/')
 +                            vals_line['name'] = '%s: %s' % (tools.ustr(vals['name']), tools.ustr(task_work.name or '/'))
                          hr_anlytic_timesheet.write(cr, uid, [line_id], vals_line, {})
-         return super(task,self).write(cr, uid, ids, vals, context)
+ 
+         res = super(task,self).write(cr, uid, ids, vals, context)
+ 
+         for task_work_id, analytic_entry in missing_analytic_entries.items():
+             timeline_id = task_work_obj._create_analytic_entries(cr, uid, analytic_entry, context=context)
+             task_work_obj.write(cr, uid, task_work_id, {'hr_analytic_timesheet_id' : timeline_id}, context=context)
+ 
+         return res
  
  task()