From 450b3f338e73c0a8735ae0a5b228775426d2bed8 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:21:48 +0530
Subject: [PATCH] fix: set up filters for dimensions

(cherry picked from commit 2fd8de2f76212921aae604a8bdd21e6ae9c120fb)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
---
 .../asset_capitalization.js                   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
index 6ac6289c837..ac369ac4895 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
@@ -11,6 +11,7 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
 
 	onload() {
 		this.setup_queries();
+		erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype);
 	}
 
 	refresh() {
@@ -63,6 +64,29 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
 			};
 		});
 
+<<<<<<< HEAD
+=======
+		me.frm.set_query("serial_and_batch_bundle", "stock_items", (doc, cdt, cdn) => {
+			let row = locals[cdt][cdn];
+			return {
+				filters: {
+					item_code: row.item_code,
+					voucher_type: doc.doctype,
+					voucher_no: ["in", [doc.name, ""]],
+					is_cancelled: 0,
+				},
+			};
+		});
+
+		me.frm.set_query("cost_canter", function () {
+			return {
+				filters: {
+					company: me.frm.doc.company,
+				}
+			};
+		});
+
+>>>>>>> 2fd8de2f76 (fix: set up filters for dimensions)
 		me.frm.set_query("item_code", "stock_items", function () {
 			return erpnext.queries.item({ is_stock_item: 1 });
 		});