nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2024-08-15 13:12:38 +05:30
committed by GitHub
parent 47a9325177
commit ea7c82c6a3
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
View File

@@ -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 () { 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 });
}); });