Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
diff --git a/setup/doctype/uom/uom.txt b/setup/doctype/uom/uom.txt
index 6577f6c..51d9806 100644
--- a/setup/doctype/uom/uom.txt
+++ b/setup/doctype/uom/uom.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:24",
"docstatus": 0,
- "modified": "2013-07-25 16:18:17",
+ "modified": "2013-10-10 15:06:53",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -40,22 +40,6 @@
},
{
"doctype": "DocField",
- "fieldname": "trash_reason",
- "fieldtype": "Small Text",
- "label": "Trash Reason",
- "oldfieldname": "trash_reason",
- "oldfieldtype": "Small Text",
- "read_only": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "uom_details",
- "fieldtype": "Section Break",
- "label": "UOM Details",
- "oldfieldtype": "Section Break"
- },
- {
- "doctype": "DocField",
"fieldname": "uom_name",
"fieldtype": "Data",
"label": "UOM Name",