From abb88662c1ac89dccc42aa3ff3d9825c062a3fa3 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/3] fix: set up filters for dimensions (cherry picked from commit 2fd8de2f76212921aae604a8bdd21e6ae9c120fb) --- .../doctype/asset_capitalization/asset_capitalization.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js index 651b75d0a70..f6f593b93bf 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() { @@ -75,6 +76,14 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s }; }); + me.frm.set_query("cost_canter", function () { + return { + filters: { + company: me.frm.doc.company, + } + }; + }); + me.frm.set_query("item_code", "stock_items", function () { return erpnext.queries.item({ is_stock_item: 1 }); }); From b84ca04975f5daf691c04870409d3c24dc1cc9d2 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/3] 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 f6f593b93bf..4e64a11ba9e 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js @@ -76,13 +76,6 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s }; }); - me.frm.set_query("cost_canter", function () { - return { - filters: { - company: me.frm.doc.company, - } - }; - }); me.frm.set_query("item_code", "stock_items", function () { return erpnext.queries.item({ is_stock_item: 1 }); From ecf0d0b3888854027bd2d7079e93a34c1b02e8f5 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/3] chore: linters check (cherry picked from commit 0d427933974c67a966edb4ba4aba0a422c49088a) --- .../assets/doctype/asset_capitalization/asset_capitalization.js | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js index 4e64a11ba9e..d9f2231b313 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js @@ -76,7 +76,6 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s }; }); - me.frm.set_query("item_code", "stock_items", function () { return erpnext.queries.item({ is_stock_item: 1 }); });