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

Add Employee Status Temporary Leave (#14423)

Browse Source
This commit is contained in:
Doridel Cahanap 2018-06-08 17:24:31 +08:00 committed by Nabin Hait
parent 8fc64a9717
commit ebb530385a
3 changed files with 2659 additions and 2659 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5314
erpnext/hr/doctype/employee/employee.json
View File

File diff suppressed because it is too large Load Diff

2
erpnext/hr/doctype/employee/employee.py
View File

@ -34,7 +34,7 @@ class Employee(NestedSet):
def validate(self): def validate(self):
from erpnext.controllers.status_updater import validate_status from erpnext.controllers.status_updater import validate_status
validate_status(self.status, ["Active", "Left"]) validate_status(self.status, ["Active", "Temporary Leave", "Left"])
self.employee = self.name self.employee = self.name
self.validate_date() self.validate_date()

2
erpnext/hr/doctype/employee/employee_list.js
View File

@ -3,7 +3,7 @@ frappe.listview_settings['Employee'] = {
filters: [["status","=", "Active"]], filters: [["status","=", "Active"]],
get_indicator: function(doc) { get_indicator: function(doc) {
var indicator = [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status]; var indicator = [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status];
indicator[1] = {"Active": "green", "Left": "darkgrey"}[doc.status]; indicator[1] = {"Active": "green", "Temporary Leave": "red", "Left": "darkgrey"}[doc.status];
return indicator; return indicator;
} }
}; };