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

Merge pull request #5414 from nabinhait/journal_entry_ux

Browse Source 
Fetch party info in Journal Entry on selection of reference Invoice
This commit is contained in:
Nabin Hait 2016-05-31 17:38:22 +05:30
commit 7ab088ed3f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@ -728,8 +728,9 @@ def get_outstanding(args):
amount_field: abs(against_jv_amount) amount_field: abs(against_jv_amount)
} }
elif args.get("doctype") in ("Sales Invoice", "Purchase Invoice"): elif args.get("doctype") in ("Sales Invoice", "Purchase Invoice"):
party_type = "Customer" if args.get("doctype") == "Sales Invoice" else "Supplier"
invoice = frappe.db.get_value(args["doctype"], args["docname"], invoice = frappe.db.get_value(args["doctype"], args["docname"],
["outstanding_amount", "conversion_rate"], as_dict=1) ["outstanding_amount", "conversion_rate", scrub(party_type)], as_dict=1)
exchange_rate = invoice.conversion_rate if (args.get("account_currency") != company_currency) else 1 exchange_rate = invoice.conversion_rate if (args.get("account_currency") != company_currency) else 1
@ -742,7 +743,9 @@ def get_outstanding(args):
return { return {
amount_field: abs(flt(invoice.outstanding_amount)), amount_field: abs(flt(invoice.outstanding_amount)),
"exchange_rate": exchange_rate "exchange_rate": exchange_rate,
"party_type": party_type,
"party": invoice.get(scrub(party_type))
} }
@frappe.whitelist() @frappe.whitelist()