Fixed: PR selection in Asset

8848digital · Oct 21, 2024 · 168bf96 · 168bf96
1 parent 75b867d
commit 168bf96
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
@@ -71,7 +71,7 @@ frappe.ui.form.on("Asset", {
 		frm.set_query("purchase_receipt", (doc) => {
 			return {
 				query: "erpnext.controllers.queries.get_purchase_receipts",
-				filters: { item_code: doc.item_code },
+				filters: { item_code: doc.item_code, company: frm.doc.company },
 			};
 		});
 		frm.set_query("purchase_invoice", (doc) => {

diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
@@ -758,6 +758,11 @@ def get_purchase_receipts(doctype, txt, searchfield, start, page_len, filters):
 			item_code=frappe.db.escape(filters.get("item_code"))
 		)
 
+	if filters and filters.get("company"):
+		query += " and pr.company = {company}".format(
+			company=frappe.db.escape(filters.get("company"))
+		)
+
 	return frappe.db.sql(query, filters)