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

fix: employee checkin doctype time permissions (#20403)

Browse Source
This commit is contained in:
Parth J. Kharwar 2020-01-27 16:03:24 +05:30 committed by Nabin Hait
parent 5e39968878
commit 011c13b3cc
2 changed files with 62 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/hr/doctype/employee_checkin/employee_checkin.js
View File

@ -2,7 +2,9 @@
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('Employee Checkin', { frappe.ui.form.on('Employee Checkin', {
// refresh: function(frm) { setup: (frm) => {
if(!frm.doc.time) {
// } frm.set_value("time", frappe.datetime.now_datetime());
}
}
}); });

60
erpnext/hr/doctype/employee_checkin/employee_checkin.json
View File

@ -1,4 +1,5 @@
{ {
"actions": [],
"allow_import": 1, "allow_import": 1,
"autoname": "EMP-CKIN-.MM.-.YYYY.-.######", "autoname": "EMP-CKIN-.MM.-.YYYY.-.######",
"creation": "2019-06-10 11:56:34.536413", "creation": "2019-06-10 11:56:34.536413",
@ -23,7 +24,6 @@
{ {
"fieldname": "employee", "fieldname": "employee",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1,
"label": "Employee", "label": "Employee",
"options": "Employee", "options": "Employee",
"reqd": 1 "reqd": 1
@ -32,14 +32,17 @@
"fetch_from": "employee.employee_name", "fetch_from": "employee.employee_name",
"fieldname": "employee_name", "fieldname": "employee_name",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1,
"label": "Employee Name", "label": "Employee Name",
"read_only": 1 "read_only": 1
}, },
{ {
"fieldname": "log_type", "fieldname": "log_type",
"fieldtype": "Select", "fieldtype": "Select",
"in_list_view": 1,
"label": "Log Type", "label": "Log Type",
"options": "\nIN\nOUT" "options": "\nIN\nOUT",
"reqd": 1
}, },
{ {
"fieldname": "shift", "fieldname": "shift",
@ -58,6 +61,7 @@
"fieldtype": "Datetime", "fieldtype": "Datetime",
"in_list_view": 1, "in_list_view": 1,
"label": "Time", "label": "Time",
"permlevel": 1,
"reqd": 1 "reqd": 1
}, },
{ {
@ -103,7 +107,8 @@
"label": "Shift Actual End" "label": "Shift Actual End"
} }
], ],
"modified": "2019-07-23 23:47:33.975263", "links": [],
"modified": "2020-01-23 04:57:42.551355",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee Checkin", "name": "Employee Checkin",
@ -147,9 +152,58 @@
"role": "HR User", "role": "HR User",
"share": 1, "share": 1,
"write": 1 "write": 1
},
{
"create": 1,
"delete": 1,
"read": 1,
"role": "Employee",
"write": 1
},
{
"delete": 1,
"email": 1,
"export": 1,
"permlevel": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"share": 1,
"write": 1
},
{
"delete": 1,
"email": 1,
"export": 1,
"permlevel": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "HR Manager",
"share": 1,
"write": 1
},
{
"delete": 1,
"email": 1,
"export": 1,
"permlevel": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "HR User",
"share": 1,
"write": 1
},
{
"permlevel": 1,
"read": 1,
"role": "Employee"
} }
], ],
"sort_field": "modified", "sort_field": "modified",
"sort_order": "ASC", "sort_order": "ASC",
"title_field": "employee_name",
"track_changes": 1 "track_changes": 1
} }