nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-21 23:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: linters check

Browse Source 
(cherry picked from commit 0d42793397)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
This commit is contained in:
Khushi Rawat
2024-08-14 14:31:56 +05:30
committed by Mergify
parent db319f95f1
commit 47a9325177
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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