diff --git a/addons/sale_timesheet/models/sale_timesheet.py b/addons/sale_timesheet/models/sale_timesheet.py
index 0d9c8a21f39..fadadfeeea5 100644
--- a/addons/sale_timesheet/models/sale_timesheet.py
+++ b/addons/sale_timesheet/models/sale_timesheet.py
@@ -56,7 +56,10 @@ class AccountAnalyticLine(models.Model):
                     ('product_id.type', '=', 'service')],
                     limit=1)
             if sol:
-                result['so_line'] = sol.id
+                result.update({
+                    'so_line': sol.id,
+                    'product_id': sol.product_id.id,
+                })
                 result = self._get_timesheet_cost(result)
 
         result = super(AccountAnalyticLine, self)._get_sale_order_line(vals=result)
@@ -75,7 +78,7 @@ class AccountAnalyticLine(models.Model):
             uom = (emp or user).company_id.project_time_mode_id
             # Nominal employee cost = 1 * company project UoM (project_time_mode_id)
             result.update(
-                amount=(-unit_amount * emp.timesheet_cost),
+                amount=(-unit_amount * cost),
                 product_uom_id=uom.id
             )
         return result