nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 14:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source 
Removed unnecessary fields related to reorder levels and quantities from the material request item JSON configuration.
This commit is contained in:
rohitwaghchaure
2026-01-06 20:59:37 +05:30
committed by GitHub
parent d889623ffa
commit 0f33e519a9
1 changed files with 1 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
erpnext/stock/doctype/material_request_item/material_request_item.json
View File

@@ -486,45 +486,6 @@
"options": "currency", "options": "currency",
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 1
<<<<<<< HEAD
=======
},
{
"fieldname": "item_reorder_section",
"fieldtype": "Section Break",
"label": "Item Reorder"
},
{
"fieldname": "column_break_fdjh",
"fieldtype": "Column Break"
},
{
"fieldname": "reorder_level",
"fieldtype": "Float",
"label": "Reorder Level",
"read_only": 1
},
{
"fieldname": "reorder_qty",
"fieldtype": "Float",
"label": "Reorder Qty",
"read_only": 1
},
{
"description": "If the reorder check is set at the Group warehouse level, the available quantity becomes the sum of the projected quantities of all its child warehouses.",
"fieldname": "projected_on_hand",
"fieldtype": "Float",
"label": "Projected On Hand",
"read_only": 1
},
{
"fieldname": "picked_qty",
"fieldtype": "Float",
"hidden": 1,
"label": "Picked Qty",
"no_copy": 1,
"non_negative": 1,
"read_only": 1
}, },
{ {
"fieldname": "packed_item", "fieldname": "packed_item",
@@ -535,7 +496,6 @@
"print_hide": 1, "print_hide": 1,
"read_only": 1, "read_only": 1,
"search_index": 1 "search_index": 1
>>>>>>> 6ade609dd6 (fix(material-request): get remaining qty on partial transaction with product bundle)
} }
], ],
"idx": 1, "idx": 1,
@@ -553,4 +513,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }