Merge from trunk

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

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 61dfba9..1f4f8d2 100644 (file)
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -53,11 +53,13 @@ class hr_analytic_timesheet(osv.osv):
         return super(hr_analytic_timesheet, self).unlink(cr, uid, ids, context)
 
 
-    def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, unit, context={}):
+    def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, date, unit, context={}):
         res = {}
 #        if prod_id and unit_amount:
-        if prod_id:
-            res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount,unit, context)
+        if prod_id and date:
+            # find company
+            company_id=self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context)
+            res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount,company_id,date,unit, context)
         return res
 
     def _getEmployeeProduct(self, cr, uid, context):