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

Merge pull request #3068 from neilLasrado/leaves

Browse Source 
Bug Fixes
This commit is contained in:
Anand Doshi 2015-04-08 13:20:18 +05:30
commit a1a3468704
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/hr/doctype/leave_allocation/leave_allocation.json
View File

@ -112,6 +112,7 @@
"permlevel": 0
},
{
"allow_on_submit": 1,
"fieldname": "total_leaves_allocated",
"fieldtype": "Float",
"label": "Total Leaves Allocated",
@ -137,7 +138,7 @@
"icon": "icon-ok",
"idx": 1,
"is_submittable": 1,
"modified": "2015-02-05 05:11:40.529337",
"modified": "2015-04-06 06:03:27.883985",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Allocation",

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

@ -151,7 +151,8 @@
"oldfieldtype": "Table",
"options": "Salary Structure Earning",
"permlevel": 0,
"read_only": 0
"read_only": 0,
"reqd": 1
},
{
"fieldname": "deduction",
@ -227,7 +228,7 @@
],
"icon": "icon-file-text",
"idx": 1,
"modified": "2015-02-05 05:11:45.120566",
"modified": "2015-04-06 06:56:02.395512",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Structure",