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

[Fix] Cost center group not showing data in the P&L report

Browse Source
This commit is contained in:
Rohit Waghchaure 2016-11-24 16:32:22 +05:30
parent 1e3d14fda7
commit bca0d73e1c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,12 +324,17 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
additional_conditions.append("posting_date >= %(from_date)s") additional_conditions.append("posting_date >= %(from_date)s")
if filters: if filters:
for key in ['cost_center', 'project']: if filters.get("project"):
if filters.get(key): additional_conditions.append("project = '%s'"%(frappe.db.escape(filters.get("project"))))
additional_conditions.append("%s = '%s'"%(key, filters.get(key))) if filters.get("cost_center"):
additional_conditions.append(get_cost_center_cond(filters.get("cost_center")))
return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else "" return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
def get_cost_center_cond(cost_center):
lft, rgt = frappe.db.get_value("Cost Center", cost_center, ["lft", "rgt"])
return (""" cost_center in (select name from `tabCost Center` where lft >=%s and rgt <=%s)"""%(lft, rgt))
def get_columns(periodicity, period_list, accumulated_values=1, company=None): def get_columns(periodicity, period_list, accumulated_values=1, company=None):
columns = [{ columns = [{
"fieldname": "account", "fieldname": "account",