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

feat: add cancellation workflow for leave allocation ledger entry

Browse Source
This commit is contained in:
Mangesh-Khairnar 2019-05-12 21:01:25 +05:30
parent 5ad83c06c2
commit 01490f1560
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/hr/doctype/leave_allocation/leave_allocation.py
View File

@ -44,8 +44,8 @@ class LeaveAllocation(Document):
def on_submit(self): def on_submit(self):
self.create_leave_ledger_entry() self.create_leave_ledger_entry()
# def before_cancel(self): def on_cancel(self):
# self.create_leave_ledger_entry(submit=False) self.create_leave_ledger_entry(submit=False)
def on_update_after_submit(self): def on_update_after_submit(self):
self.validate_new_leaves_allocated_value() self.validate_new_leaves_allocated_value()
@ -123,14 +123,14 @@ class LeaveAllocation(Document):
expiry_days = frappe.db.get_value("Leave Type", self.leave_type, "carry_forward_leave_expiry") expiry_days = frappe.db.get_value("Leave Type", self.leave_type, "carry_forward_leave_expiry")
args = dict( args = dict(
leaves=self.carry_forwarded_leaves * 1 if submit else -1, leaves=self.carry_forwarded_leaves,
to_date=add_days(self.from_date, expiry_days) if expiry_days else self.to_date, to_date=add_days(self.from_date, expiry_days) if expiry_days else self.to_date,
is_carry_forward=1 is_carry_forward=1
) )
create_leave_ledger_entry(self, args) create_leave_ledger_entry(self, args, submit)
args = dict( args = dict(
leaves=self.new_leaves_allocated * 1 if submit else -1, leaves=self.new_leaves_allocated,
to_date=self.to_date, to_date=self.to_date,
is_carry_forward=0 is_carry_forward=0
) )