[MERGE] forward port of branch 7.0 up to ab5ecef

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

diff --cc addons/project_timesheet/project_timesheet.py
index 31a3963,6cbb4e8..3c3b7fe
--- 1/addons/project_timesheet/project_timesheet.py
--- 2/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@@ -251,8 -276,16 +273,15 @@@ class task(osv.osv)
                          if vals.get('name',False):
                              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()
  
  class res_partner(osv.osv):
      _inherit = 'res.partner'