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 1/4] 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 });
 		});

From db319f95f1ea8b3920800b7e0a48440bda8c6c08 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:26:47 +0530
Subject: [PATCH 2/4] fix: removed extra filter condition

(cherry picked from commit 6fa29376a0b95029aa35ec10fd4cce915c8c6832)
---
 .../doctype/asset_capitalization/asset_capitalization.js   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
index ac369ac4895..a99b6405f7c 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
@@ -78,13 +78,6 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
 			};
 		});
 
-		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 () {

From 47a9325177325b12e893f4c67156752a4a814b41 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:31:56 +0530
Subject: [PATCH 3/4] chore: linters check

(cherry picked from commit 0d427933974c67a966edb4ba4aba0a422c49088a)

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

diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
index a99b6405f7c..e8f641f434d 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
@@ -78,8 +78,11 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
 			};
 		});
 
+<<<<<<< HEAD
 
 >>>>>>> 2fd8de2f76 (fix: set up filters for dimensions)
+=======
+>>>>>>> 0d42793397 (chore: linters check)
 		me.frm.set_query("item_code", "stock_items", function () {
 			return erpnext.queries.item({ is_stock_item: 1 });
 		});

From ea7c82c6a3cb5e03cd54240350365520b6569df9 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Thu, 15 Aug 2024 13:12:38 +0530
Subject: [PATCH 4/4] chore: resolved conflicts

---
 .../asset_capitalization.js                   | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
index e8f641f434d..6f73dfc6736 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
@@ -64,25 +64,6 @@ 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,
-				},
-			};
-		});
-
-<<<<<<< HEAD
-
->>>>>>> 2fd8de2f76 (fix: set up filters for dimensions)
-=======
->>>>>>> 0d42793397 (chore: linters check)
 		me.frm.set_query("item_code", "stock_items", function () {
 			return erpnext.queries.item({ is_stock_item: 1 });
 		});