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

Credit note fix

Browse Source
This commit is contained in:
deepeshgarg007
2018-12-06 14:59:54 +05:30
parent f98adf2be5
commit e7a91b9526
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@@ -198,10 +198,15 @@ class ReceivablePayableReport(object):
if self.filters.based_on_payment_terms and self.payment_term_map.get(gle.voucher_no): if self.filters.based_on_payment_terms and self.payment_term_map.get(gle.voucher_no):
pdc_amount = flt(self.pdc_details.get((gle.voucher_no, gle.party), {}).get("pdc_amount")) pdc_amount = flt(self.pdc_details.get((gle.voucher_no, gle.party), {}).get("pdc_amount"))
for d in self.payment_term_map.get(gle.voucher_no): for d in self.payment_term_map.get(gle.voucher_no):
if payment_amount + credit_note_amount >= d[1]: term_outstanding_amount = 0
temp = payment_amount if payment_amount >= d[1]:
payment_amount = payment_amount - d[1] + credit_note_amount payment_amount = payment_amount - d[1]
credit_note_amount = credit_note_amount - d[1] + temp - payment_amount if credit_note_amount:
term_outstanding_amount -= credit_note_amount
row = self.prepare_row(party_naming_by, args, gle, term_outstanding_amount,
credit_note_amount, d[0], payment_amount , d[1], d[2], 0)
credit_note_amount = 0
data.append(row)
else: else:
outstanding_amount = d[1] - payment_amount - credit_note_amount outstanding_amount = d[1] - payment_amount - credit_note_amount
if pdc_amount > outstanding_amount: if pdc_amount > outstanding_amount: