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

Merge branch 'version-12-hotfix' into v12-pre-release

Browse Source
This commit is contained in:
Nabin Hait
2021-03-16 11:03:25 +05:30
parent 19a27d3f46 6cf37d58f1
commit 238df8b3ec
28 changed files with 208 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/hr/doctype/hr_settings/hr_settings.json
View File

@@ -175,7 +175,7 @@
"idx": 1,
"issingle": 1,
"links": [],
"modified": "2019-12-31 14:28:32.004121",
"modified": "2021-02-25 13:06:37.978785",
"modified_by": "Administrator",
"module": "HR",
"name": "HR Settings",
@@ -192,5 +192,6 @@
}
],
"sort_field": "modified",
"sort_order": "ASC"
"sort_order": "ASC",
"track_changes": 1
}