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

[Fix] Payment Tool, Fetch due date when user does 'Get Outstanding Vouchers'

Browse Source
This commit is contained in:
shreyas 2016-05-05 15:56:48 +05:30
parent 55cbd52200
commit c2a49211a5
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/payment_tool/payment_tool.js
View File

@ -146,6 +146,10 @@ frappe.ui.form.on("Payment Tool", "get_outstanding_vouchers", function(frm) {
c.total_amount = d.invoice_amount;
c.outstanding_amount = d.outstanding_amount;
if (in_list(['Sales Invoice', 'Purchase Invoice'], d.voucher_type)){
c.due_date = d.due_date
}
if (frm.doc.set_payment_amount) {
c.payment_amount = d.outstanding_amount;
}

6
erpnext/accounts/doctype/payment_tool_detail/payment_tool_detail.json
View File

@ -18,7 +18,7 @@
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"in_list_view": 0,
"label": "Against Voucher Type",
"length": 0,
"no_copy": 0,
@ -70,7 +70,7 @@
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"in_list_view": 1,
"label": "Due Date",
"length": 0,
"no_copy": 0,
@ -194,7 +194,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
"modified": "2016-05-05 05:37:41.206708",
"modified": "2016-05-05 06:22:24.736160",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Tool Detail",

3
erpnext/accounts/utils.py
View File

@ -473,7 +473,8 @@ def get_outstanding_invoices(party_type, party, account, condition=None):
'posting_date': d.posting_date,
'invoice_amount': flt(d.invoice_amount),
'payment_amount': flt(d.payment_amount),
'outstanding_amount': flt(d.invoice_amount - d.payment_amount, precision)
'outstanding_amount': flt(d.invoice_amount - d.payment_amount, precision),
'due_date': frappe.db.get_value(d.voucher_type, d.voucher_no, "due_date")
})
return outstanding_invoices