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

fix(report): project filter in financial statement

Browse Source
This commit is contained in:
Nabin Hait 2018-09-07 14:15:38 +05:30
parent 0d0ebee5dd
commit 3a342e8d93
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/report/financial_statements.py
View File

@ -352,7 +352,8 @@ def set_gl_entries_by_account(
"to_date": to_date, "to_date": to_date,
"lft": root_lft, "lft": root_lft,
"rgt": root_rgt, "rgt": root_rgt,
"cost_center": filters.cost_center "cost_center": filters.cost_center,
"project": filters.project
}, },
as_dict=True) as_dict=True)
@ -379,7 +380,7 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
if not isinstance(filters.get("project"), list): if not isinstance(filters.get("project"), list):
projects = str(filters.get("project")).strip() projects = str(filters.get("project")).strip()
filters.project = [d.strip() for d in projects.split(',') if d] filters.project = [d.strip() for d in projects.split(',') if d]
additional_conditions.append("project = '%s'" % (frappe.db.escape(filters.get("project")))) additional_conditions.append("project in %(project)s")
if filters.get("cost_center"): if filters.get("cost_center"):
filters.cost_center = get_cost_centers_with_children(filters.cost_center) filters.cost_center = get_cost_centers_with_children(filters.cost_center)