From f038f70eea4b17b9dcb22c359b6a419638c858e9 Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Tue, 3 Apr 2012 18:33:36 +0530 Subject: [PATCH 1/2] [FIX] project_timesheet : Fixes the keyerror of journal_id when edit worklog entry on task lp bug: https://launchpad.net/bugs/953006 fixed bzr revid: amp@tinyerp.com-20120403130336-iprq12cr21q7ykji --- addons/project_timesheet/project_timesheet.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index db7066505e1..eff4ea8778a 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -142,10 +142,6 @@ class project_work(osv.osv): vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/') if 'user_id' in vals: vals_line['user_id'] = vals['user_id'] - result = self.get_user_related_details(cr, uid, vals['user_id']) - for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'): - if result.get(fld, False): - vals_line[fld] = result[fld] if 'date' in vals: vals_line['date'] = vals['date'][:10] @@ -153,6 +149,10 @@ class project_work(osv.osv): default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id vals_line['unit_amount'] = vals['hours'] prod_id = vals_line.get('product_id', line_id.product_id.id) # False may be set + result = self.get_user_related_details(cr, uid, vals.get('user_id', uid)) + for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'): + if result.get(fld, False): + vals_line[fld] = result[fld] if result.get('product_uom_id',False) and (not result['product_uom_id'] == default_uom): vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id']) From a3d768a3cd6b81d03a6faba7d6dd77c69081c487 Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Tue, 24 Apr 2012 18:29:52 +0530 Subject: [PATCH 2/2] [FIX] Correction on above fix bzr revid: amp@tinyerp.com-20120424125952-60z1bclva62j8qxt --- addons/project_timesheet/project_timesheet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index eff4ea8778a..2cec9b90a40 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -149,7 +149,7 @@ class project_work(osv.osv): default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id vals_line['unit_amount'] = vals['hours'] prod_id = vals_line.get('product_id', line_id.product_id.id) # False may be set - result = self.get_user_related_details(cr, uid, vals.get('user_id', uid)) + result = self.get_user_related_details(cr, uid, vals.get('user_id', task.user_id.id)) for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'): if result.get(fld, False): vals_line[fld] = result[fld]