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

Renamed Health Insurance to Employee Health Insurance

Browse Source
This commit is contained in:
Nabin Hait
2018-04-15 15:03:54 +05:30
committed by Shreya
parent 43274de5df
commit d2861df939
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2766,11 +2766,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
<<<<<<< HEAD
"modified": "2018-04-25 09:08:06.852604", "modified": "2018-04-25 09:08:06.852604",
=======
"modified": "2018-04-14 13:30:43.761434",
>>>>>>> Removed employee table from Salary Structure and added employee name in all forms
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee", "name": "Employee",