Minor fix in accounts receivable report
This commit is contained in:
parent
879b3a0cbc
commit
c2a5858143
@ -132,8 +132,8 @@ class AccountsReceivableReport(object):
|
|||||||
if not hasattr(self, "gl_entries"):
|
if not hasattr(self, "gl_entries"):
|
||||||
conditions, values = self.prepare_conditions()
|
conditions, values = self.prepare_conditions()
|
||||||
self.gl_entries = webnotes.conn.sql("""select * from `tabGL Entry`
|
self.gl_entries = webnotes.conn.sql("""select * from `tabGL Entry`
|
||||||
where docstatus < 2 {} order by posting_date, account""".format(conditions),
|
where docstatus < 2 {0} order by posting_date, account""".format(conditions),
|
||||||
values, as_dict=True)
|
values, as_dict=True, debug=1)
|
||||||
|
|
||||||
return self.gl_entries
|
return self.gl_entries
|
||||||
|
|
||||||
@ -153,8 +153,8 @@ class AccountsReceivableReport(object):
|
|||||||
if not account_map:
|
if not account_map:
|
||||||
webnotes.throw(_("No Customer Accounts found."))
|
webnotes.throw(_("No Customer Accounts found."))
|
||||||
else:
|
else:
|
||||||
accounts_list = ['"{}"'.format(ac) for ac in account_map]
|
accounts_list = ['"{0}"'.format(ac) for ac in account_map]
|
||||||
conditions.append("account in ({})".format(", ".join(accounts_list)))
|
conditions.append("account in ({0})".format(", ".join(accounts_list)))
|
||||||
|
|
||||||
return " and ".join(conditions), values
|
return " and ".join(conditions), values
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user