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

[FIX] hr_timesheet_sheet: to link attendaces with timesheet (employee now attchaed with resource so change the query) 

bzr revid: mra@tinyerp.com-20100309063603-3sxf2efirreqoneq
This commit is contained in:
mra (Open ERP) 2010-03-09 12:06:03 +05:30
parent d1c37a80b6
commit 1e86221189
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
View File

@ -482,7 +482,7 @@ class hr_attendance(osv.osv):
res[line_id] = False
return res
def _sheet_search(self, cursor, user, obj, name, args):
def _sheet_search(self, cursor, user, obj, name, args, context={}):
if not len(args):
return []
sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
@ -525,9 +525,11 @@ class hr_attendance(osv.osv):
LEFT JOIN (hr_attendance a \
LEFT JOIN hr_employee e \
ON (a.employee_id = e.id)) \
LEFT JOIN resource_resource r \
ON (e.resource_id = r.id) \
ON (s.date_to >= date_trunc(\'day\',a.name) \
AND s.date_from <= a.name \
AND s.user_id = e.user_id) ' + \
AND s.user_id = r.user_id) ' + \
qu1, qu2)
res = cursor.fetchall()
if not len(res):