schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Employee advance (#11875)

Browse Source 
* Employee Advances against Expense Claim

* added employee advance test cases and docs

* Default Employee Advance Account field in company

* Cleanup and fixes of employee advance
This commit is contained in:
Nabin Hait
2017-12-14 13:25:57 +05:30
committed by GitHub
parent 02b4b5f526
commit d0249b0880
28 changed files with 1445 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/utils.py
View File

@@ -576,7 +576,7 @@ def get_outstanding_invoices(party_type, party, account, condition=None):
outstanding_invoices = []
precision = frappe.get_precision("Sales Invoice", "outstanding_amount")
if party_type == "Customer" or party_type == "Student":
if party_type in ("Customer", "Student"):
dr_or_cr = "debit_in_account_currency - credit_in_account_currency"
payment_dr_or_cr = "payment_gl_entry.credit_in_account_currency - payment_gl_entry.debit_in_account_currency"
else: