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 }); });