From 556147053bf29ee89adbeee78fdfb71ce5c2ef9f Mon Sep 17 00:00:00 2001 From: ced <> Date: Thu, 21 Dec 2006 08:26:15 +0000 Subject: [PATCH] HR_TIMESHEET: better fix for employee without product bzr revid: ced-2388990551e11d22f51d379ba2cd66fd0243031a --- addons/hr_timesheet/hr_timesheet.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index 1124aa7afbb..c53a07e5558 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -64,7 +64,9 @@ class hr_analytic_timesheet(osv.osv): emp_obj = self.pool.get('hr.employee') emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)]) if emp_id: - return emp_obj.browse(cr, uid, emp_id[0], context).product_id.id + emp=emp_obj.browse(cr, uid, emp_id[0], context) + if emp.product_id: + return emp.product_id.id return False def _getEmployeeUnit(self, cr, uid, context): @@ -72,9 +74,8 @@ class hr_analytic_timesheet(osv.osv): emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)]) if emp_id: emp=emp_obj.browse(cr, uid, emp_id[0], context) - if not emp.product_id: - raise osv.except_osv('No product !', "The employee haven't an associated product") - return emp.product_id.uom_id.id + if emp.product_id: + return emp.product_id.uom_id.id return False def _getGeneralAccount(self, cr, uid, context):