Merge pull request #946 from joshuajan/7.0_hr_holidays_report_fix

skip the inactivate employee in leaves summary
This commit is contained in:
antonylesuisse 2014-07-07 20:48:19 +02:00
commit 6b274e4451
1 changed files with 1 additions and 3 deletions

View File

@ -223,9 +223,7 @@ class report_custom(report_rml):
elif data['model']=='ir.ui.menu':
for id in data['form']['depts']:
dept = obj_dept.browse(cr, uid, id, context=context)
cr.execute("""SELECT id FROM hr_employee \
WHERE department_id = %s""", (id,))
emp_ids = [x[0] for x in cr.fetchall()]
emp_ids = obj_emp.search(cr, uid, [('department_id', '=', id)], context=context)
if emp_ids==[]:
continue
dept_done=0