From 725173aca584dc04c534ef751b50effe4cda4b42 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 12 Mar 2013 18:21:24 +0530 Subject: [PATCH 1/2] fixed monthly attendance report --- .../monthly_attendance_details/monthly_attendance_details.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.sql b/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.sql index 7487fb4010..762a94f7fb 100644 --- a/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.sql +++ b/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.sql @@ -1 +1 @@ -SELECT DISTINCT `tabAttendance`.employee, `tabAttendance`.employee_name FROM `tabAttendance` WHERE `tabAttendance`.fiscal_year like '%(fiscal_year)s%%' AND `tabAttendance`.`company` like '%(company)s%%' AND `tabAttendance`.`employee` like '%(employee)s%%' \ No newline at end of file +SELECT DISTINCT `tabAttendance`.employee, `tabEmployee`.employee_name FROM `tabAttendance`, `tabEmployee` WHERE `tabEmployee`.name = `tabAttendance`.employee and `tabAttendance`.fiscal_year like '%(fiscal_year)s%%' AND `tabAttendance`.company like '%(company)s%%' AND `tabAttendance`.employee like '%(employee)s%%' \ No newline at end of file From 4fad8743565e88c8c223b71922e1d0913147da52 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 12 Mar 2013 18:27:25 +0530 Subject: [PATCH 2/2] reload monthly attendance details report --- patches/patch_list.py | 1 + 1 file changed, 1 insertion(+) diff --git a/patches/patch_list.py b/patches/patch_list.py index 7409c0e986..935fe299d3 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -213,4 +213,5 @@ patch_list = [ "patches.march_2013.p02_get_global_default", "execute:webnotes.bean('Style Settings', 'Style Settings').save()", "patches.march_2013.p03_rename_blog_to_blog_post", + "execute:webnotes.reload_doc('hr', 'search_criteria', 'monthly_attendance_details')", ] \ No newline at end of file