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

[fix] accounts payable report

Browse Source
This commit is contained in:
Nabin Hait 2015-04-28 16:45:20 +05:30
parent 45ca8a4d31
commit 47e5c764c3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,14 +170,15 @@ class ReceivablePayableReport(object):
if not hasattr(self, "gl_entries"):
conditions, values = self.prepare_conditions(party_type)
self.gl_entries = frappe.db.sql("""select * from `tabGL Entry`
where docstatus < 2 {0} order by posting_date, party"""
where docstatus < 2 and party_type=%s {0} order by posting_date, party"""
.format(conditions), values, as_dict=True)
return self.gl_entries
def prepare_conditions(self, party_type):
conditions = [""]
values = []
values = [party_type]
party_type_field = scrub(party_type)
if self.filters.company:
@ -185,8 +186,8 @@ class ReceivablePayableReport(object):
values.append(self.filters.company)
if self.filters.get(party_type_field):
conditions.append("party_type=%s and party=%s")
values += [party_type, self.filters.get(party_type_field)]
conditions.append("party=%s")
values.append(self.filters.get(party_type_field))
return " and ".join(conditions), values