mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-07 23:31:20 +00:00
fix: set up filters for dimensions
(cherry picked from commit 2fd8de2f76)
# Conflicts:
# erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
This commit is contained in:
@@ -11,6 +11,7 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
|
|||||||
|
|
||||||
onload() {
|
onload() {
|
||||||
this.setup_queries();
|
this.setup_queries();
|
||||||
|
erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype);
|
||||||
}
|
}
|
||||||
|
|
||||||
refresh() {
|
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 () {
|
me.frm.set_query("item_code", "stock_items", function () {
|
||||||
return erpnext.queries.item({ is_stock_item: 1 });
|
return erpnext.queries.item({ is_stock_item: 1 });
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user