CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-09 13:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent negative values in BOM fields (#48520, #48662) (backport #48696) (#48897)

Browse Source 
* fix: prevent negative values in BOM fields (#48520, #48662) (#48696)

* fix: prevent negative values in BOM fields (#48520, #48662)

* fix: applied non_negative validation using Desk UI for BOM fields

(cherry picked from commit 3a80e116e8)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_operation/bom_operation.json
#	erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json

* chore: resolve conflicts

* chore: resolve conflicts

---------

Co-authored-by: Vishist16 <101823906+Vishist16@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
This commit is contained in:
mergify[bot]
2025-07-31 15:42:23 +00:00
committed by GitHub
parent 5291c66ea1
commit 5de5a8bfd5
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/bom_operation/bom_operation.json
View File

@@ -65,6 +65,7 @@
"fieldname": "hour_rate", "fieldname": "hour_rate",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Hour Rate", "label": "Hour Rate",
"non_negative": 1,
"oldfieldname": "hour_rate", "oldfieldname": "hour_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "currency", "options": "currency",
@@ -78,6 +79,7 @@
"fieldtype": "Float", "fieldtype": "Float",
"in_list_view": 1, "in_list_view": 1,
"label": "Operation Time", "label": "Operation Time",
"non_negative": 1,
"oldfieldname": "time_in_mins", "oldfieldname": "time_in_mins",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"reqd": 1 "reqd": 1
@@ -194,7 +196,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2022-11-04 17:17:16.986941", "modified": "2025-07-31 16:17:47.287117",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM Operation", "name": "BOM Operation",

6
erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
View File

@@ -42,6 +42,7 @@
"fieldtype": "Float", "fieldtype": "Float",
"in_list_view": 1, "in_list_view": 1,
"label": "Qty", "label": "Qty",
"non_negative": 1,
"reqd": 1 "reqd": 1
}, },
{ {
@@ -49,6 +50,7 @@
"fieldtype": "Currency", "fieldtype": "Currency",
"in_list_view": 1, "in_list_view": 1,
"label": "Rate", "label": "Rate",
"non_negative": 1,
"options": "currency" "options": "currency"
}, },
{ {
@@ -92,7 +94,7 @@
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2023-01-03 14:19:28.460965", "modified": "2025-07-31 16:21:44.047007",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM Scrap Item", "name": "BOM Scrap Item",
@@ -103,4 +105,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }