Merge pull request #5752 from KanchanChauhan/employee-holiday-attendance-report-renamed

Employee Attendance report renamed to Employees working on a holiday

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"
 				},
 				{

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",

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"
 }

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")
+