nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[script report] collection report

Browse Source
This commit is contained in:
Nabin Hait
2013-05-01 15:05:29 +05:30
parent e388465e17
commit 006d074b26
8 changed files with 155 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
accounts/report/accounts_payable/accounts_payable.py
View File

@@ -67,8 +67,7 @@ def get_gl_entries(filters, before_report_date=True):
gl_entries = []
gl_entries = webnotes.conn.sql("""select * from `tabGL Entry`
where ifnull(is_cancelled, 'No') = 'No' %s order by posting_date, account""" %
(conditions) % (", ".join(['%s']*len(supplier_accounts))),
tuple(supplier_accounts), as_dict=1)
(conditions), tuple(supplier_accounts), as_dict=1)
return gl_entries
def get_conditions(filters, before_report_date=True):
@@ -85,7 +84,7 @@ def get_conditions(filters, before_report_date=True):
conditions, filters)
if supplier_accounts:
conditions += " and account in (%s)"
conditions += " and account in (%s)" % (", ".join(['%s']*len(supplier_accounts)))
if filters.get("report_date"):
if before_report_date: