diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py index b96ea18c27..51c258bb49 100644 --- a/erpnext/config/hr.py +++ b/erpnext/config/hr.py @@ -206,7 +206,7 @@ def get_data(): { "type": "report", "is_query_report": True, - "name": "Employee Holiday Attendance", + "name": "Employees working on a holiday", "doctype": "Employee" }, { diff --git a/erpnext/hr/report/employee_holiday_attendance/__init__.py b/erpnext/hr/report/employees_working_on_a_holiday/__init__.py similarity index 100% rename from erpnext/hr/report/employee_holiday_attendance/__init__.py rename to erpnext/hr/report/employees_working_on_a_holiday/__init__.py diff --git a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.js b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.js similarity index 79% rename from erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.js rename to erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.js index 1345433748..97108e8575 100644 --- a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.js +++ b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.js @@ -1,7 +1,7 @@ -// Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors +// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors // For license information, please see license.txt -frappe.query_reports["Employee Holiday Attendance"] = { +frappe.query_reports["Employees working on a holiday"] = { "filters": [ { "fieldname":"from_date", diff --git a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.json b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json similarity index 61% rename from erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.json rename to erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json index f538d30c24..a379fd26ed 100644 --- a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.json +++ b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json @@ -1,18 +1,18 @@ { "add_total_row": 0, "apply_user_permissions": 1, - "creation": "2016-01-27 11:12:14.972452", + "creation": "2016-07-14 12:03:56.967739", "disabled": 0, "docstatus": 0, "doctype": "Report", "idx": 0, "is_standard": "Yes", - "modified": "2016-01-27 11:12:14.972452", + "modified": "2016-07-14 12:03:56.967739", "modified_by": "Administrator", "module": "HR", - "name": "Employee Holiday Attendance", + "name": "Employees working on a holiday", "owner": "Administrator", "ref_doctype": "Attendance", - "report_name": "Employee Holiday Attendance", + "report_name": "Employees working on a holiday", "report_type": "Script Report" } \ No newline at end of file diff --git a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.py b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py similarity index 100% rename from erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.py rename to erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 979c1a55b5..45fa3f36d9 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -293,3 +293,5 @@ erpnext.patches.v7_0.rename_time_sheet_doctype execute:frappe.delete_doc_if_exists("Report", "Customers Not Buying Since Long Time") erpnext.patches.v7_0.make_is_group_fieldtype_as_check execute:frappe.reload_doc('projects', 'doctype', 'timesheet', force=True) +execute:frappe.delete_doc_if_exists("Report", "Employee Holiday Attendance") +