From 99849f8eabf6cdc2da1975470d3cbfb5b858fe0a Mon Sep 17 00:00:00 2001 From: tunde Date: Thu, 21 Sep 2017 10:23:40 +0100 Subject: [PATCH] fix failing tests --- .../doctype/payment_entry/payment_entry.py | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 4913fe1ca5..6901c8edd0 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -769,14 +769,18 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount= references = get_outstanding_reference_documents(args=args) for reference in references: - pe.append("references", { - 'reference_doctype': reference.voucher_type, - 'reference_name': reference.voucher_no, - 'due_date': reference.due_date, - 'total_amount': reference.invoice_amount, - 'outstanding_amount': reference.outstanding_amount, - 'allocated_amount': reference.outstanding_amount - }) + if reference.voucher_no == dn: + allocated_amount = min(paid_amount, reference.outstanding_amount) + pe.append("references", { + 'reference_doctype': reference.voucher_type, + 'reference_name': reference.voucher_no, + 'due_date': reference.due_date, + 'total_amount': reference.invoice_amount, + 'outstanding_amount': reference.outstanding_amount, + 'allocated_amount': reference.outstanding_amount + }) + if paid_amount: + paid_amount -= allocated_amount pe.setup_party_account_field() pe.set_missing_values() @@ -785,6 +789,7 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount= pe.set_amounts() return pe + def get_paid_amount(dt, dn, party_type, party, account, due_date): if party_type=="Customer": dr_or_cr = "credit_in_account_currency - debit_in_account_currency"