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

Merge pull request #15983 from rohitwaghchaure/fixed_claimed_amount_issue

Browse Source 
Claimed amount is not reset on cancel of employee advance
This commit is contained in:
rohitwaghchaure 2018-11-14 13:21:11 +05:30 committed by GitHub
commit 5395b164cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/hr/doctype/employee_advance/employee_advance.py
View File

@ -58,10 +58,9 @@ class EmployeeAdvance(Document):
select sum(ifnull(allocated_amount, 0)) select sum(ifnull(allocated_amount, 0))
from `tabExpense Claim Advance` from `tabExpense Claim Advance`
where employee_advance = %s and docstatus=1 and allocated_amount > 0 where employee_advance = %s and docstatus=1 and allocated_amount > 0
""", self.name)[0][0] """, self.name)[0][0] or 0
if claimed_amount: frappe.db.set_value("Employee Advance", self.name, "claimed_amount", claimed_amount)
frappe.db.set_value("Employee Advance", self.name, "claimed_amount", claimed_amount)
@frappe.whitelist() @frappe.whitelist()
def make_bank_entry(dt, dn): def make_bank_entry(dt, dn):