mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-21 11:15:10 +00:00
fix: rearrange stock settings fields
(cherry picked from commit 93f461c6f3)
# Conflicts:
# erpnext/stock/doctype/stock_settings/stock_settings.json
This commit is contained in:
committed by
Mergify
parent
de0dfbca9a
commit
87703c6511
@@ -46,18 +46,20 @@
|
|||||||
"auto_reserve_serial_and_batch",
|
"auto_reserve_serial_and_batch",
|
||||||
"serial_and_batch_item_settings_tab",
|
"serial_and_batch_item_settings_tab",
|
||||||
"section_break_7",
|
"section_break_7",
|
||||||
|
"allow_existing_serial_no",
|
||||||
"do_not_use_batchwise_valuation",
|
"do_not_use_batchwise_valuation",
|
||||||
"auto_create_serial_and_batch_bundle_for_outward",
|
"auto_create_serial_and_batch_bundle_for_outward",
|
||||||
"pick_serial_and_batch_based_on",
|
"pick_serial_and_batch_based_on",
|
||||||
"naming_series_prefix",
|
|
||||||
"column_break_mhzc",
|
"column_break_mhzc",
|
||||||
"disable_serial_no_and_batch_selector",
|
"disable_serial_no_and_batch_selector",
|
||||||
"use_naming_series",
|
|
||||||
"use_serial_batch_fields",
|
"use_serial_batch_fields",
|
||||||
"do_not_update_serial_batch_on_creation_of_auto_bundle",
|
"do_not_update_serial_batch_on_creation_of_auto_bundle",
|
||||||
"allow_existing_serial_no",
|
|
||||||
"serial_and_batch_bundle_section",
|
"serial_and_batch_bundle_section",
|
||||||
"set_serial_and_batch_bundle_naming_based_on_naming_series",
|
"set_serial_and_batch_bundle_naming_based_on_naming_series",
|
||||||
|
"section_break_gnhq",
|
||||||
|
"use_naming_series",
|
||||||
|
"column_break_wslv",
|
||||||
|
"naming_series_prefix",
|
||||||
"stock_planning_tab",
|
"stock_planning_tab",
|
||||||
"auto_material_request",
|
"auto_material_request",
|
||||||
"auto_indent",
|
"auto_indent",
|
||||||
@@ -480,6 +482,14 @@
|
|||||||
"fieldname": "set_serial_and_batch_bundle_naming_based_on_naming_series",
|
"fieldname": "set_serial_and_batch_bundle_naming_based_on_naming_series",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Set Serial and Batch Bundle Naming Based on Naming Series"
|
"label": "Set Serial and Batch Bundle Naming Based on Naming Series"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "section_break_gnhq",
|
||||||
|
"fieldtype": "Section Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_wslv",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "icon-cog",
|
"icon": "icon-cog",
|
||||||
@@ -487,7 +497,11 @@
|
|||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"issingle": 1,
|
"issingle": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2025-02-17 14:36:36.177743",
|
"modified": "2025-02-17 14:36:36.177743",
|
||||||
|
=======
|
||||||
|
"modified": "2025-02-28 15:08:35.938840",
|
||||||
|
>>>>>>> 93f461c6f3 (fix: rearrange stock settings fields)
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Stock",
|
"module": "Stock",
|
||||||
"name": "Stock Settings",
|
"name": "Stock Settings",
|
||||||
|
|||||||
Reference in New Issue
Block a user