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

Merge pull request #23391 from anupamvs/leave-application-status-fix

Browse Source 
fix: leave application status fix
This commit is contained in:
rohitwaghchaure
2020-09-23 19:06:17 +05:30
committed by GitHub
parent 2984f42e2b 960229793b
commit 76fdc9faaa
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,7 +166,6 @@
"fieldtype": "Column Break" "fieldtype": "Column Break"
}, },
{ {
"allow_on_submit": 1,
"default": "Open", "default": "Open",
"fieldname": "status", "fieldname": "status",
"fieldtype": "Select", "fieldtype": "Select",
@@ -247,7 +246,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"max_attachments": 3, "max_attachments": 3,
"modified": "2020-08-13 17:22:44.832397", "modified": "2020-09-23 18:53:11.608446",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Application", "name": "Leave Application",

2
erpnext/hr/doctype/leave_application/leave_application.py
View File

@@ -56,7 +56,7 @@ class LeaveApplication(Document):
def on_cancel(self): def on_cancel(self):
self.create_leave_ledger_entry(submit=False) self.create_leave_ledger_entry(submit=False)
self.status = "Cancelled" self.db_set("status", "Cancelled")
# notify leave applier about cancellation # notify leave applier about cancellation
self.notify_employee() self.notify_employee()
self.cancel_attendance() self.cancel_attendance()