nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 13:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23247 from Anurag810/attendance_calendar_map_v12

Browse Source 
fix: Attendance calendar map fix
This commit is contained in:
rohitwaghchaure
2020-09-08 10:15:01 +05:30
committed by GitHub
parent 8dd72018c2 053fdd91da
commit b06c618585
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/hr/doctype/attendance/attendance.py
View File

@@ -82,7 +82,8 @@ def add_attendance(events, start, end, conditions=None):
e = { e = {
"name": d.name, "name": d.name,
"doctype": "Attendance", "doctype": "Attendance",
"date": d.attendance_date, "start": d.attendance_date,
"end": d.attendance_date,
"title": cstr(d.status), "title": cstr(d.status),
"docstatus": d.docstatus "docstatus": d.docstatus
} }

6
erpnext/hr/doctype/attendance/attendance_calendar.js
View File

@@ -1,12 +1,6 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.views.calendar["Attendance"] = { frappe.views.calendar["Attendance"] = {
field_map: {
"start": "attendance_date",
"end": "attendance_date",
"id": "name",
"docstatus": 1
},
options: { options: {
header: { header: {
left: 'prev,next today', left: 'prev,next today',