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

Merge pull request #6493 from nabinhait/ar_issue

Browse Source 
[fix] Accounts Receivable report if negative write off in invoice
This commit is contained in:
Nabin Hait 2016-09-29 13:39:16 +05:30 committed by GitHub
commit a3ffe530f0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,14 +218,16 @@ class ReceivablePayableReport(object):
conditions, values = self.prepare_conditions(party_type) conditions, values = self.prepare_conditions(party_type)
if self.filters.get(scrub(party_type)): if self.filters.get(scrub(party_type)):
select_fields = "debit_in_account_currency as debit, credit_in_account_currency as credit" select_fields = "sum(debit_in_account_currency) as debit, sum(credit_in_account_currency) as credit"
else: else:
select_fields = "debit, credit" select_fields = "sum(debit) as debit, sum(credit) as credit"
self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party, self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party,
voucher_type, voucher_no, against_voucher_type, against_voucher, account_currency, remarks, {0} voucher_type, voucher_no, against_voucher_type, against_voucher,
account_currency, remarks, {0}
from `tabGL Entry` from `tabGL Entry`
where docstatus < 2 and party_type=%s and (party is not null and party != '') {1} where docstatus < 2 and party_type=%s and (party is not null and party != '') {1}
group by voucher_type, voucher_no, against_voucher_type, against_voucher
order by posting_date, party""" order by posting_date, party"""
.format(select_fields, conditions), values, as_dict=True) .format(select_fields, conditions), values, as_dict=True)