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

Merge pull request #5002 from rohitwaghchaure/support_week_14_03_5

Browse Source 
[fix]Fiscal year removed from trends report
This commit is contained in:
Nabin Hait 2016-03-18 10:33:18 +05:30
commit d61b21cedf
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
erpnext/controllers/trends.py
View File

@ -46,6 +46,9 @@ def get_data(filters, conditions):
if conditions["based_on_select"] in ["t1.project,", "t2.project,"]: if conditions["based_on_select"] in ["t1.project,", "t2.project,"]:
cond = 'and '+ conditions["based_on_select"][:-1] +' IS Not NULL' cond = 'and '+ conditions["based_on_select"][:-1] +' IS Not NULL'
year_start_date, year_end_date = frappe.db.get_value("Fiscal Year",
filters.get('fiscal_year'), ["year_start_date", "year_end_date"])
if filters.get("group_by"): if filters.get("group_by"):
sel_col = '' sel_col = ''
ind = conditions["columns"].index(conditions["grbc"][0]) ind = conditions["columns"].index(conditions["grbc"][0])
@ -62,12 +65,12 @@ def get_data(filters, conditions):
else : else :
inc = 1 inc = 1
data1 = frappe.db.sql(""" select %s from `tab%s` t1, `tab%s Item` t2 %s data1 = frappe.db.sql(""" select %s from `tab%s` t1, `tab%s Item` t2 %s
where t2.parent = t1.name and t1.company = %s and t1.fiscal_year = %s and where t2.parent = t1.name and t1.company = %s and t1.posting_date >= %s and %s >= t1.posting_date and
t1.docstatus = 1 %s %s t1.docstatus = 1 %s %s
group by %s group by %s
""" % (query_details, conditions["trans"], conditions["trans"], conditions["addl_tables"], "%s", """ % (query_details, conditions["trans"], conditions["trans"], conditions["addl_tables"], "%s",
"%s", conditions.get("addl_tables_relational_cond"), cond, conditions["group_by"]), (filters.get("company"), "%s", "%s", conditions.get("addl_tables_relational_cond"), cond, conditions["group_by"]), (filters.get("company"),
filters["fiscal_year"]),as_list=1) year_start_date, year_end_date),as_list=1)
for d in range(len(data1)): for d in range(len(data1)):
#to add blanck column #to add blanck column
@ -77,25 +80,25 @@ def get_data(filters, conditions):
#to get distinct value of col specified by group_by in filter #to get distinct value of col specified by group_by in filter
row = frappe.db.sql("""select DISTINCT(%s) from `tab%s` t1, `tab%s Item` t2 %s row = frappe.db.sql("""select DISTINCT(%s) from `tab%s` t1, `tab%s Item` t2 %s
where t2.parent = t1.name and t1.company = %s and t1.fiscal_year = %s where t2.parent = t1.name and t1.company = %s and t1.posting_date >= %s and %s >= t1.posting_date
and t1.docstatus = 1 and %s = %s %s and t1.docstatus = 1 and %s = %s %s
""" % """ %
(sel_col, conditions["trans"], conditions["trans"], conditions["addl_tables"], (sel_col, conditions["trans"], conditions["trans"], conditions["addl_tables"],
"%s", "%s", conditions["group_by"], "%s", conditions.get("addl_tables_relational_cond")), "%s", "%s", "%s", conditions["group_by"], "%s", conditions.get("addl_tables_relational_cond")),
(filters.get("company"), filters.get("fiscal_year"), data1[d][0]), as_list=1) (filters.get("company"), year_start_date, year_end_date, data1[d][0]), as_list=1)
for i in range(len(row)): for i in range(len(row)):
des = ['' for q in range(len(conditions["columns"]))] des = ['' for q in range(len(conditions["columns"]))]
#get data for group_by filter #get data for group_by filter
row1 = frappe.db.sql(""" select %s , %s from `tab%s` t1, `tab%s Item` t2 %s row1 = frappe.db.sql(""" select %s , %s from `tab%s` t1, `tab%s Item` t2 %s
where t2.parent = t1.name and t1.company = %s and t1.fiscal_year = %s where t2.parent = t1.name and t1.company = %s and t1.posting_date >= %s and %s >= t1.posting_date
and t1.docstatus = 1 and %s = %s and %s = %s %s and t1.docstatus = 1 and %s = %s and %s = %s %s
""" % """ %
(sel_col, conditions["period_wise_select"], conditions["trans"], (sel_col, conditions["period_wise_select"], conditions["trans"],
conditions["trans"], conditions["addl_tables"], "%s", "%s", sel_col, conditions["trans"], conditions["addl_tables"], "%s", "%s","%s", sel_col,
"%s", conditions["group_by"], "%s", conditions.get("addl_tables_relational_cond")), "%s", conditions["group_by"], "%s", conditions.get("addl_tables_relational_cond")),
(filters.get("company"), filters.get("fiscal_year"), row[i][0], (filters.get("company"), year_start_date, year_end_date, row[i][0],
data1[d][0]), as_list=1) data1[d][0]), as_list=1)
des[ind] = row[i][0] des[ind] = row[i][0]
@ -106,13 +109,13 @@ def get_data(filters, conditions):
data.append(des) data.append(des)
else: else:
data = frappe.db.sql(""" select %s from `tab%s` t1, `tab%s Item` t2 %s data = frappe.db.sql(""" select %s from `tab%s` t1, `tab%s Item` t2 %s
where t2.parent = t1.name and t1.company = %s and t1.fiscal_year = %s and where t2.parent = t1.name and t1.company = %s and t1.posting_date >= %s and %s >= t1.posting_date and
t1.docstatus = 1 %s %s t1.docstatus = 1 %s %s
group by %s group by %s
""" % """ %
(query_details, conditions["trans"], conditions["trans"], conditions["addl_tables"], (query_details, conditions["trans"], conditions["trans"], conditions["addl_tables"],
"%s", "%s", cond, conditions.get("addl_tables_relational_cond", ""), conditions["group_by"]), "%s", "%s", "%s", cond, conditions.get("addl_tables_relational_cond", ""), conditions["group_by"]),
(filters.get("company"), filters.get("fiscal_year")), as_list=1) (filters.get("company"), year_start_date, year_end_date), as_list=1)
return data return data