nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-25 09:38:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Variant Items, List View Enabled to Variant Status Change (#38468)

Browse Source 
* feat: Purchase Register Report Supplier Group filter Adding

* fix: Variant Items, List View Enabled to Variant Status Change

* Update purchase_register.js

* Update purchase_register.py

(cherry picked from commit 9ea963bfe9)

# Conflicts:
#	erpnext/stock/doctype/item/item_list.js
This commit is contained in:
Parameshwari Palanisamy
2024-01-02 14:04:56 +05:30
committed by Mergify
parent a2a6460c6c
commit 25b169059d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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