Merge pull request #7571 from RicardoJohann/projectfilter

added project filter to gl and carry project filter from P&L

erpnext/accounts/report/general_ledger/general_ledger.js

@@ -47,6 +47,12 @@ frappe.query_reports["General Ledger"] = {
 			"label": __("Voucher No"),
 			"fieldtype": "Data",
 		},
+		{
+			"fieldname":"project",
+			"label": __("Project"),
+			"fieldtype": "Link",
+			"options": "Project"
+		},
 		{
 			"fieldtype": "Break",
 		},

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -149,6 +149,9 @@ def get_conditions(filters):
 	if not (filters.get("account") or filters.get("party") or filters.get("group_by_account")):
 		conditions.append("posting_date >=%(from_date)s")
 
+	if filters.get("project"):
+		conditions.append("project=%(project)s")
+
 	from frappe.desk.reportview import build_match_conditions
 	match_conditions = build_match_conditions("GL Entry")
 	if match_conditions: conditions.append(match_conditions)

erpnext/public/js/financial_statements.js

@@ -31,7 +31,8 @@ erpnext.financial_statements = {
 			"account": data.account,
 			"company": frappe.query_report_filters_by_name.company.get_value(),
 			"from_date": data.from_date || data.year_start_date,
-			"to_date": data.to_date || data.year_end_date
+			"to_date": data.to_date || data.year_end_date,
+			"project": $.grep(frappe.query_report.filters, function(e){ return e.df.fieldname == 'project'; })[0].$input.val()
 		};
 		frappe.set_route("query-report", "General Ledger");
 	},