diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py index 22e26a87402..d83df50ebd1 100644 --- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py +++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py @@ -48,7 +48,7 @@ class hr_analytic_timesheet(osv.osv): _inherit = "hr.analytic.timesheet" - def on_change_account_id(self, cr, uid, ids, user_id, account_id, unit_amount=0, journal_id=0): + def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0, journal_id=0): res = {} if not (account_id): #avoid a useless call to super @@ -62,7 +62,7 @@ class hr_analytic_timesheet(osv.osv): if not temp: #if there isn't any record for this journal_id and account_id - return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids,account_id,user_id, unit_amount) + return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids,account_id,user_id, unit_amount) else: #get the old values from super and add the value from the new relation analytic_journal_rate_grid r = self.pool.get('analytic_journal_rate_grid').browse(cr, uid, temp)[0] diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index ec53bddfb26..71c3542c010 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -59,9 +59,9 @@ class project_work(osv.osv): vals_line['user_id'] = vals['user_id'] vals_line['date'] = vals['date'][:10] vals_line['unit_amount'] = vals['hours'] - vals_line['account_id'] = obj_task.project_id.category_id.id - res = obj.on_change_account_id(cr, uid, False, obj_task.project_id.category_id.id) - print 'Got', res + acc_id = obj_task.project_id.category_id.id + vals_line['account_id'] = acc_id + res = obj.on_change_account_id(cr, uid, False, acc_id) if res.get('value'): vals_line.update(res['value']) vals_line['general_account_id'] = a @@ -109,7 +109,6 @@ class project_work(osv.osv): 'hr_analytic_timesheet_id':fields.integer('Related Timeline Id') } - project_work() class project_project(osv.osv):