From 5b9d517d04a319f0e41ac2891215d55a8e1c14ba Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 17 Mar 2016 22:46:09 +0530 Subject: [PATCH] [fix]Fiscal year removed from trends report --- erpnext/controllers/trends.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/erpnext/controllers/trends.py b/erpnext/controllers/trends.py index 7d1b96ba801..3a627161fd9 100644 --- a/erpnext/controllers/trends.py +++ b/erpnext/controllers/trends.py @@ -46,6 +46,9 @@ def get_data(filters, conditions): if conditions["based_on_select"] in ["t1.project,", "t2.project,"]: 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"): sel_col = '' ind = conditions["columns"].index(conditions["grbc"][0]) @@ -62,12 +65,12 @@ def get_data(filters, conditions): else : inc = 1 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 group by %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"), - filters["fiscal_year"]),as_list=1) + "%s", "%s", conditions.get("addl_tables_relational_cond"), cond, conditions["group_by"]), (filters.get("company"), + year_start_date, year_end_date),as_list=1) for d in range(len(data1)): #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 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 """ % (sel_col, conditions["trans"], conditions["trans"], conditions["addl_tables"], - "%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) + "%s", "%s", "%s", conditions["group_by"], "%s", conditions.get("addl_tables_relational_cond")), + (filters.get("company"), year_start_date, year_end_date, data1[d][0]), as_list=1) for i in range(len(row)): des = ['' for q in range(len(conditions["columns"]))] #get data for group_by filter 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 """ % (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")), - (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) des[ind] = row[i][0] @@ -106,13 +109,13 @@ def get_data(filters, conditions): data.append(des) else: 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 group by %s """ % (query_details, conditions["trans"], conditions["trans"], conditions["addl_tables"], - "%s", "%s", cond, conditions.get("addl_tables_relational_cond", ""), conditions["group_by"]), - (filters.get("company"), filters.get("fiscal_year")), as_list=1) + "%s", "%s", "%s", cond, conditions.get("addl_tables_relational_cond", ""), conditions["group_by"]), + (filters.get("company"), year_start_date, year_end_date), as_list=1) return data