Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Employee Attendance report renamed to Employees working on a holiday
This commit is contained in:
Nabin Hait 2016-07-16 10:58:52 +05:30 committed by GitHub
commit 530b86b9b2
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/config/hr.py
View File

@ -206,7 +206,7 @@ def get_data():
{ {
"type": "report", "type": "report",
"is_query_report": True, "is_query_report": True,
"name": "Employee Holiday Attendance", "name": "Employees working on a holiday",
"doctype": "Employee" "doctype": "Employee"
}, },
{ {

0
erpnext/hr/report/employee_holiday_attendance/__init__.py → erpnext/hr/report/employees_working_on_a_holiday/__init__.py
View File

4
erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.js → erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.js
View File

@ -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 // For license information, please see license.txt
frappe.query_reports["Employee Holiday Attendance"] = { frappe.query_reports["Employees working on a holiday"] = {
"filters": [ "filters": [
{ {
"fieldname":"from_date", "fieldname":"from_date",

8
erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.json → erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json
View File

@ -1,18 +1,18 @@
{ {
"add_total_row": 0, "add_total_row": 0,
"apply_user_permissions": 1, "apply_user_permissions": 1,
"creation": "2016-01-27 11:12:14.972452", "creation": "2016-07-14 12:03:56.967739",
"disabled": 0, "disabled": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "Report", "doctype": "Report",
"idx": 0, "idx": 0,
"is_standard": "Yes", "is_standard": "Yes",
"modified": "2016-01-27 11:12:14.972452", "modified": "2016-07-14 12:03:56.967739",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee Holiday Attendance", "name": "Employees working on a holiday",
"owner": "Administrator", "owner": "Administrator",
"ref_doctype": "Attendance", "ref_doctype": "Attendance",
"report_name": "Employee Holiday Attendance", "report_name": "Employees working on a holiday",
"report_type": "Script Report" "report_type": "Script Report"
} }

0
erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.py → erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py
View File

2
erpnext/patches.txt
View File

@ -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") execute:frappe.delete_doc_if_exists("Report", "Customers Not Buying Since Long Time")
erpnext.patches.v7_0.make_is_group_fieldtype_as_check erpnext.patches.v7_0.make_is_group_fieldtype_as_check
execute:frappe.reload_doc('projects', 'doctype', 'timesheet', force=True) execute:frappe.reload_doc('projects', 'doctype', 'timesheet', force=True)
execute:frappe.delete_doc_if_exists("Report", "Employee Holiday Attendance")