From 4ba4d9dbef3793e9f29489de4918f50720677c9e Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 6 Apr 2015 16:16:32 +0530 Subject: [PATCH 1/2] fix - update button didnt work in leave allocation after submit --- erpnext/hr/doctype/leave_allocation/leave_allocation.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json index 362b14cc257..cbb8997f7c9 100644 --- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json +++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json @@ -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", From 4b29ccc2b00b61b65254a30f32709802f734042c Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 6 Apr 2015 16:27:07 +0530 Subject: [PATCH 2/2] Salary Structure - Earnings made mandatory --- erpnext/hr/doctype/salary_structure/salary_structure.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.json b/erpnext/hr/doctype/salary_structure/salary_structure.json index 5cbe0d28c83..658125fa5b0 100644 --- a/erpnext/hr/doctype/salary_structure/salary_structure.json +++ b/erpnext/hr/doctype/salary_structure/salary_structure.json @@ -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",