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

fix: consider the existing paid payment request for phone payment channel

Browse Source
This commit is contained in:
Mangesh-Khairnar 2020-10-23 15:41:05 +05:30
parent e03a02d9c0
commit 675f79920e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,6 +393,10 @@ def get_amount(ref_doc, payment_account=None):
frappe.throw(_("Payment Entry is already created")) frappe.throw(_("Payment Entry is already created"))
def get_existing_payment_request_amount(ref_dt, ref_dn): def get_existing_payment_request_amount(ref_dt, ref_dn):
"""
Get the existing payment request which are unpaid or partially paid for payment channel other than Phone
and get the summation of existing paid payment request for Phone payment channel.
"""
existing_payment_request_amount = frappe.db.sql(""" existing_payment_request_amount = frappe.db.sql("""
select sum(grand_total) select sum(grand_total)
from `tabPayment Request` from `tabPayment Request`
@ -400,7 +404,9 @@ def get_existing_payment_request_amount(ref_dt, ref_dn):
reference_doctype = %s reference_doctype = %s
and reference_name = %s and reference_name = %s
and docstatus = 1 and docstatus = 1
and status = 'Paid' and (status != 'Paid'
or (payment_channel = 'Phone'
and status = 'Paid'))
""", (ref_dt, ref_dn)) """, (ref_dt, ref_dn))
return flt(existing_payment_request_amount[0][0]) if existing_payment_request_amount else 0 return flt(existing_payment_request_amount[0][0]) if existing_payment_request_amount else 0

1
erpnext/accounts/doctype/payment_request/test_payment_request.py
View File

@ -127,7 +127,6 @@ class TestPaymentRequest(unittest.TestCase):
recipient_id="nabin@erpnext.com", return_doc=1) recipient_id="nabin@erpnext.com", return_doc=1)
pr1.grand_total = 200 pr1.grand_total = 200
pr1.submit() pr1.submit()
pr1.set_as_paid()
# Make a 2nd Payment Request # Make a 2nd Payment Request
pr2 = make_payment_request(dt="Sales Order", dn=so.name, pr2 = make_payment_request(dt="Sales Order", dn=so.name,