Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi

This commit is contained in:
Anand Doshi 2013-10-10 16:10:25 +05:30
commit 97e9deb1ff

View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-01-10 16:34:24", "creation": "2013-01-10 16:34:24",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-25 16:18:17", "modified": "2013-10-10 15:06:53",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -38,22 +38,6 @@
"doctype": "DocType", "doctype": "DocType",
"name": "UOM" "name": "UOM"
}, },
{
"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", "doctype": "DocField",
"fieldname": "uom_name", "fieldname": "uom_name",