[MERGE] forward port of branch 8.0 up to d3e9bde

2015-08-06 11:54:32 +02:00
parent 4b3f16e0d1 d3e9bde738
commit 3d26eb02ab
42 changed files with 247 additions and 190 deletions
@@ -116,7 +116,7 @@ class hr_analytic_timesheet(osv.osv):
            res ['value']['general_account_id']= a
        return res

-    def on_change_user_id(self, cr, uid, ids, user_id, account_id, unit_amount=0):
+    def on_change_user_id(self, cr, uid, ids, user_id, account_id=False, unit_amount=0):
        res = super(hr_analytic_timesheet, self).on_change_user_id(cr, uid, ids, user_id)

        if account_id: