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

fix: Paid showing in AR/AP report

Browse Source 
(cherry picked from commit 5e7ce5370f6af634f7674772529cf4933114f3ef)
This commit is contained in:
Deepesh Garg 2021-11-29 23:53:28 +05:30 committed by mergify-bot
parent a37c99a23d
commit 107fb43d6a
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,11 @@ class ReceivablePayableReport(object):
invoiced = 0.0, invoiced = 0.0,
paid = 0.0, paid = 0.0,
credit_note = 0.0, credit_note = 0.0,
outstanding = 0.0 outstanding = 0.0,
invoiced_in_account_currency = 0.0,
paid_in_account_currency = 0.0,
credit_note_in_account_currency = 0.0,
outstanding_in_account_currency = 0.0
) )
self.get_invoices(gle) self.get_invoices(gle)
@ -150,21 +154,28 @@ class ReceivablePayableReport(object):
# gle_balance will be the total "debit - credit" for receivable type reports and # gle_balance will be the total "debit - credit" for receivable type reports and
# and vice-versa for payable type reports # and vice-versa for payable type reports
gle_balance = self.get_gle_balance(gle) gle_balance = self.get_gle_balance(gle)
gle_balance_in_account_currency = self.get_gle_balance_in_account_currency(gle)
if gle_balance > 0: if gle_balance > 0:
if gle.voucher_type in ('Journal Entry', 'Payment Entry') and gle.against_voucher: if gle.voucher_type in ('Journal Entry', 'Payment Entry') and gle.against_voucher:
# debit against sales / purchase invoice # debit against sales / purchase invoice
row.paid -= gle_balance row.paid -= gle_balance
row.paid_in_account_currency -= gle_balance_in_account_currency
else: else:
# invoice # invoice
row.invoiced += gle_balance row.invoiced += gle_balance
row.invoiced_in_account_currency += gle_balance_in_account_currency
else: else:
# payment or credit note for receivables # payment or credit note for receivables
if self.is_invoice(gle): if self.is_invoice(gle):
# stand alone debit / credit note # stand alone debit / credit note
row.credit_note -= gle_balance row.credit_note -= gle_balance
row.credit_note_in_account_currency -= gle_balance_in_account_currency
else: else:
# advance / unlinked payment or other adjustment # advance / unlinked payment or other adjustment
row.paid -= gle_balance row.paid -= gle_balance
row.paid_in_account_currency -= gle_balance_in_account_currency
if gle.cost_center: if gle.cost_center:
row.cost_center = str(gle.cost_center) row.cost_center = str(gle.cost_center)
@ -216,8 +227,13 @@ class ReceivablePayableReport(object):
# as we can use this to filter out invoices without outstanding # as we can use this to filter out invoices without outstanding
for key, row in self.voucher_balance.items(): for key, row in self.voucher_balance.items():
row.outstanding = flt(row.invoiced - row.paid - row.credit_note, self.currency_precision) row.outstanding = flt(row.invoiced - row.paid - row.credit_note, self.currency_precision)
row.outstanding_in_account_currency = flt(row.invoiced_in_account_currency - row.paid_in_account_currency - \
row.credit_note_in_account_currency, self.currency_precision)
row.invoice_grand_total = row.invoiced row.invoice_grand_total = row.invoiced
if abs(row.outstanding) > 1.0/10 ** self.currency_precision:
if (abs(row.outstanding) > 1.0/10 ** self.currency_precision) and \
(abs(row.outstanding_in_account_currency) > 1.0/10 ** self.currency_precision):
# non-zero oustanding, we must consider this row # non-zero oustanding, we must consider this row
if self.is_invoice(row) and self.filters.based_on_payment_terms: if self.is_invoice(row) and self.filters.based_on_payment_terms:
@ -583,12 +599,14 @@ class ReceivablePayableReport(object):
else: else:
select_fields = "debit, credit" select_fields = "debit, credit"
doc_currency_fields = "debit_in_account_currency, credit_in_account_currency"
remarks = ", remarks" if self.filters.get("show_remarks") else "" remarks = ", remarks" if self.filters.get("show_remarks") else ""
self.gl_entries = frappe.db.sql(""" self.gl_entries = frappe.db.sql("""
select select
name, posting_date, account, party_type, party, voucher_type, voucher_no, cost_center, name, posting_date, account, party_type, party, voucher_type, voucher_no, cost_center,
against_voucher_type, against_voucher, account_currency, {0} {remarks} against_voucher_type, against_voucher, account_currency, {0}, {1} {remarks}
from from
`tabGL Entry` `tabGL Entry`
where where
@ -596,8 +614,8 @@ class ReceivablePayableReport(object):
and is_cancelled = 0 and is_cancelled = 0
and party_type=%s and party_type=%s
and (party is not null and party != '') and (party is not null and party != '')
{1} {2} {3}""" {2} {3} {4}"""
.format(select_fields, date_condition, conditions, order_by, remarks=remarks), values, as_dict=True) .format(select_fields, doc_currency_fields, date_condition, conditions, order_by, remarks=remarks), values, as_dict=True)
def get_sales_invoices_or_customers_based_on_sales_person(self): def get_sales_invoices_or_customers_based_on_sales_person(self):
if self.filters.get("sales_person"): if self.filters.get("sales_person"):
@ -718,6 +736,13 @@ class ReceivablePayableReport(object):
# get the balance of the GL (debit - credit) or reverse balance based on report type # get the balance of the GL (debit - credit) or reverse balance based on report type
return gle.get(self.dr_or_cr) - self.get_reverse_balance(gle) return gle.get(self.dr_or_cr) - self.get_reverse_balance(gle)
def get_gle_balance_in_account_currency(self, gle):
# get the balance of the GL (debit - credit) or reverse balance based on report type
return gle.get(self.dr_or_cr + '_in_account_currency') - self.get_reverse_balance_in_account_currency(gle)
def get_reverse_balance_in_account_currency(self, gle):
return gle.get('debit_in_account_currency' if self.dr_or_cr=='credit' else 'credit_in_account_currency')
def get_reverse_balance(self, gle): def get_reverse_balance(self, gle):
# get "credit" balance if report type is "debit" and vice versa # get "credit" balance if report type is "debit" and vice versa
return gle.get('debit' if self.dr_or_cr=='credit' else 'credit') return gle.get('debit' if self.dr_or_cr=='credit' else 'credit')