Merge pull request #40593 from barredterra/uom-fields

erpnext/setup/doctype/uom/uom.json

@@ -8,8 +8,12 @@
  "document_type": "Setup",
  "engine": "InnoDB",
  "field_order": [
-  "enabled",
   "uom_name",
+  "symbol",
+  "common_code",
+  "description",
+  "column_break_obth",
+  "enabled",
   "must_be_whole_number"
  ],
  "fields": [
@@ -35,12 +39,33 @@
    "fieldname": "enabled",
    "fieldtype": "Check",
    "label": "Enabled"
+  },
+  {
+   "fieldname": "symbol",
+   "fieldtype": "Data",
+   "label": "Symbol"
+  },
+  {
+   "description": "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010",
+   "fieldname": "common_code",
+   "fieldtype": "Data",
+   "label": "Common Code",
+   "length": 3
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "label": "Description"
+  },
+  {
+   "fieldname": "column_break_obth",
+   "fieldtype": "Column Break"
   }
  ],
  "icon": "fa fa-compass",
  "idx": 1,
  "links": [],
- "modified": "2021-10-18 14:07:43.722144",
+ "modified": "2024-03-21 14:46:48.422406",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "UOM",
@@ -78,5 +103,6 @@
  "quick_entry": 1,
  "show_name_in_global_search": 1,
  "sort_field": "modified",
- "sort_order": "ASC"
+ "sort_order": "ASC",
+ "states": []
 }

erpnext/setup/doctype/uom/uom.py

@@ -14,8 +14,11 @@ class UOM(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
+		common_code: DF.Data | None
+		description: DF.SmallText | None
 		enabled: DF.Check
 		must_be_whole_number: DF.Check
+		symbol: DF.Data | None
 		uom_name: DF.Data
 	# end: auto-generated types