Rifakat (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-17104-rha into
lp:openobject-addons/6.0.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #832569 in OpenERP Addons: "[6.0] hr_holidays, holidays report per
department shows Inactive employees"
https://bugs.launchpad.net/openobject-addons/+bug/832569
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-17104-rha/+merge/72994
Hello,
Fixed the problem of showing inactive employees in Holidays report per
department.
Thanks,
Rifakat
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-17104-rha/+merge/72994
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-17104-rha.
=== modified file 'hr_holidays/report/holidays_summary_report.py'
--- hr_holidays/report/holidays_summary_report.py 2011-01-17 18:02:22 +0000
+++ hr_holidays/report/holidays_summary_report.py 2011-08-26 05:54:24 +0000
@@ -216,10 +216,8 @@
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()]
- if emp_ids==[]:
+ emp_ids = obj_emp.search(cr, uid, [('department_id','=',id)], context=context)
+ if not emp_ids:
continue
dept_done=0
for item in obj_emp.read(cr, uid, emp_ids, ['id', 'name']):
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
