nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 05:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixes] fix grand total calculation for Payment Request and set visibility of Resend Payment Email button

Browse Source
This commit is contained in:
Saurabh
2016-02-22 20:35:16 +05:30
parent 3a2682919a
commit 1864879b91
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/payment_request/payment_request.js
View File

@@ -16,6 +16,7 @@ frappe.ui.form.on("Payment Request", "onload", function(frm, dt, dn){
}) })
frappe.ui.form.on("Payment Request", "refresh", function(frm) { frappe.ui.form.on("Payment Request", "refresh", function(frm) {
if(!in_list(["Initiated", "Paid"], frm.doc.status) && !frm.doc.__islocal){
frm.add_custom_button(__('Resend Payment Email'), function(){ frm.add_custom_button(__('Resend Payment Email'), function(){
frappe.call({ frappe.call({
method: "erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email", method: "erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email",
@@ -29,5 +30,6 @@ frappe.ui.form.on("Payment Request", "refresh", function(frm) {
} }
}); });
}); });
}
}); });

4
erpnext/accounts/doctype/payment_request/payment_request.py
View File

@@ -209,11 +209,11 @@ def get_amount(ref_doc, dt):
"""get amount based on doctype""" """get amount based on doctype"""
if dt == "Sales Order": if dt == "Sales Order":
base_grand_total = flt(ref_doc.base_grand_total) base_grand_total = flt(ref_doc.base_grand_total)
grand_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid) grand_total = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid) / flt(ref_doc.conversion_rate)
if dt == "Sales Invoice": if dt == "Sales Invoice":
base_grand_total = flt(ref_doc.base_grand_total) base_grand_total = flt(ref_doc.base_grand_total)
grand_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid) grand_total = flt(ref_doc.base_grand_total) - flt(ref_doc.outstanding_amount) / flt(ref_doc.conversion_rate)
if base_grand_total > 0 and grand_total > 0 : if base_grand_total > 0 and grand_total > 0 :
return base_grand_total, grand_total return base_grand_total, grand_total