odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

HR_TIMESHEET: better fix for employee without product 

bzr revid: ced-2388990551e11d22f51d379ba2cd66fd0243031a
This commit is contained in:
ced 2006-12-21 08:26:15 +00:00
parent 617c86ad20
commit 556147053b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/hr_timesheet/hr_timesheet.py
View File

@ -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):