fix: filter project by customer

erpnext/accounts/doctype/sales_invoice/sales_invoice.js

@@ -317,6 +317,8 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 
 		if (this.frm.doc.__onload && this.frm.doc.__onload.load_after_mapping) return;
 
+		super.customer();
+
 		erpnext.utils.get_party_details(this.frm,
 			"erpnext.accounts.party.get_party_details", {
 				posting_date: this.frm.doc.posting_date,

erpnext/controllers/queries.py

@@ -354,7 +354,9 @@ def get_project_name(doctype, txt, searchfield, start, page_len, filters):
 
 	fields = get_fields(doctype, ["name", "project_name"])
 	searchfields = frappe.get_meta(doctype).get_search_fields()
-	searchfields = " or ".join(["`tabProject`." + field + " like %(txt)s" for field in searchfields])
+	searchfields = (
+		"(" + " or ".join(["`tabProject`." + field + " like %(txt)s" for field in searchfields]) + ")"
+	)
 
 	return frappe.db.sql(
 		"""select {fields} from `tabProject`
@@ -656,6 +658,12 @@ def get_filtered_dimensions(
 	if meta.has_field("disabled"):
 		query_filters.append(["disabled", "!=", 1])
 
+	if meta.has_field("is_active"):
+		query_filters.append(["is_active", "!=", "No"])
+
+	if meta.has_field("status"):
+		query_filters.append(["status", "not in", ["Completed", "Cancelled"]])
+
 	if meta.has_field("company"):
 		query_filters.append(["company", "=", filters.get("company")])
 

erpnext/public/js/controllers/buying.js

@@ -231,6 +231,18 @@ erpnext.buying = {
 			}
 
 			project(doc, cdt, cdn) {
+				let me = this;
+				if (this.frm.doc.project) {
+					frappe.call({
+						method: 'erpnext.projects.doctype.project.project.get_cost_center_name',
+						args: { project: this.frm.doc.project },
+						callback: function (r, rt) {
+							if (!r.exc) {
+								frappe.model.set_value(me.frm.doc.doctype, me.frm.doc.name, "cost_center", r.message);
+							}
+						}
+					})
+				}
 				var item = frappe.get_doc(cdt, cdn);
 				if(item.project) {
 					$.each(this.frm.doc["items"] || [],

erpnext/public/js/controllers/stock_controller.js

@@ -11,6 +11,21 @@ erpnext.stock.StockController = class StockController extends frappe.ui.form.Con
 		}
 	}
 
+	project(doc, cdt, cdn) {
+		let me = this;
+		if (this.frm.doc.project) {
+			frappe.call({
+				method: 'erpnext.projects.doctype.project.project.get_cost_center_name',
+				args: { project: this.frm.doc.project },
+				callback: function (r, rt) {
+					if (!r.exc) {
+						frappe.model.set_value(me.frm.doc.doctype, me.frm.doc.name, "cost_center", r.message);
+					}
+				}
+			})
+		}
+	}
+
 	setup_warehouse_query() {
 		var me = this;
 		erpnext.queries.setup_queries(this.frm, "Warehouse", function() {

erpnext/public/js/utils/sales_common.js

@@ -94,6 +94,14 @@ erpnext.sales_common = {
 
 			customer() {
 				var me = this;
+				this.frm.set_query('project', function (doc) {
+					return {
+						query: "erpnext.controllers.queries.get_project_name",
+						filters: {
+							'customer': doc.customer
+						}
+					}
+				});
 				erpnext.utils.get_party_details(this.frm, null, null, function() {
 					me.apply_price_list();
 				});
@@ -368,6 +376,11 @@ erpnext.sales_common = {
 							args: {project: this.frm.doc.project},
 							callback: function(r, rt) {
 								if(!r.exc) {
+									frappe.model.set_value(me.frm.doc.doctype, me.frm.doc.name, "cost_center", r.message);
+
+									// is this really necessary? would it make more sense to invoke this on change of cost centre instead?
+									// would it make sense to set project on each row also?
+									// should something similar be done on the purchase side of things too?
 									$.each(me.frm.doc["items"] || [], function(i, row) {
 										if(r.message) {
 											frappe.model.set_value(row.doctype, row.name, "cost_center", r.message);

erpnext/selling/doctype/sales_order/sales_order.js

@@ -141,14 +141,15 @@ frappe.ui.form.on("Sales Order", {
 			};
 		});
 
-		frm.set_query('project', function(doc, cdt, cdn) {
-			return {
-				query: "erpnext.controllers.queries.get_project_name",
-				filters: {
-					'customer': doc.customer
-				}
-			}
-		});
+		// this doesn't do anything. is it ok to remove?
+		// frm.set_query('project', function(doc, cdt, cdn) {
+		// 	return {
+		// 		query: "erpnext.controllers.queries.get_project_name",
+		// 		filters: {
+		// 			'customer': doc.customer
+		// 		}
+		// 	}
+		// });
 
 		frm.set_query('warehouse', 'items', function(doc, cdt, cdn) {
 			let row  = locals[cdt][cdn];