RobbyV2/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2025-12-03 18:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(uom): validate negative conversion factor

Browse Source 
(cherry picked from commit 6141071a18)

# Conflicts:
#	erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json
This commit is contained in:
SowmyaArunachalam
2025-11-19 22:05:19 +05:30
committed by Mergify
parent eb2571492f
commit 625c1758b6
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json
View File

@@ -38,6 +38,7 @@
"unique": 0 "unique": 0
}, },
{ {
<<<<<<< HEAD
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
@@ -84,4 +85,29 @@
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"track_seen": 0 "track_seen": 0
} }
=======
"fieldname": "conversion_factor",
"fieldtype": "Float",
"in_list_view": 1,
"label": "Conversion Factor",
"non_negative": 1,
"oldfieldname": "conversion_factor",
"oldfieldtype": "Float"
}
],
"idx": 1,
"istable": 1,
"links": [],
"modified": "2025-11-19 21:27:13.968771",
"modified_by": "Administrator",
"module": "Stock",
"name": "UOM Conversion Detail",
"owner": "Administrator",
"permissions": [],
"row_format": "Dynamic",
"sort_field": "creation",
"sort_order": "DESC",
"states": []
}
>>>>>>> 6141071a18 (fix(uom): validate negative conversion factor)