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

chore: resolve conflict

Browse Source
This commit is contained in:
diptanilsaha
2026-02-26 16:44:17 +05:30
parent 25b169059d
commit 39f8d35414
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/stock/doctype/item/item_list.js
View File

@@ -1,11 +1,14 @@
<<<<<<< HEAD
frappe.listview_settings["Item"] = { frappe.listview_settings["Item"] = {
add_fields: ["item_name", "stock_uom", "item_group", "image", "has_variants", "end_of_life", "disabled"], add_fields: [
======= "item_name",
frappe.listview_settings['Item'] = { "stock_uom",
add_fields: ["item_name", "stock_uom", "item_group", "image", "item_group",
"has_variants", "end_of_life", "disabled", "variant_of"], "image",
>>>>>>> 9ea963bfe9 (fix: Variant Items, List View Enabled to Variant Status Change (#38468)) "has_variants",
"end_of_life",
"disabled",
"variant_of",
],
filters: [["disabled", "=", "0"]], filters: [["disabled", "=", "0"]],
get_indicator: function (doc) { get_indicator: function (doc) {