From d43e068a5b665d7bee4529e0e5075ea14803a0fb Mon Sep 17 00:00:00 2001 From: Ranjith Date: Tue, 15 May 2018 20:11:30 +0530 Subject: [PATCH] fix Leave Encashment unlink additional component, readonly encashed days --- erpnext/hr/doctype/leave_allocation/leave_allocation.json | 5 +++-- erpnext/hr/doctype/leave_encashment/leave_encashment.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json index 15934da2705..da39993611a 100644 --- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json +++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json @@ -454,6 +454,7 @@ "bold": 0, "collapsible": 0, "columns": 0, + "depends_on": "eval:doc.total_leaves_encashed>0", "fieldname": "total_leaves_encashed", "fieldtype": "Float", "hidden": 0, @@ -470,7 +471,7 @@ "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, - "read_only": 0, + "read_only": 1, "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, @@ -588,7 +589,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-05-15 17:06:18.343451", + "modified": "2018-05-15 20:04:56.901123", "modified_by": "Administrator", "module": "HR", "name": "Leave Allocation", diff --git a/erpnext/hr/doctype/leave_encashment/leave_encashment.py b/erpnext/hr/doctype/leave_encashment/leave_encashment.py index d4d90c0772d..24096ab8fb1 100644 --- a/erpnext/hr/doctype/leave_encashment/leave_encashment.py +++ b/erpnext/hr/doctype/leave_encashment/leave_encashment.py @@ -44,6 +44,7 @@ class LeaveEncashment(Document): def on_cancel(self): if self.additional_component: frappe.get_doc("Additional Salary Component", self.additional_component).cancel() + self.db_set("additional_component", "") if self.leave_allocation: frappe.db.set_value("Leave Allocation", self.leave_allocation, "total_leaves_encashed",