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

This commit is contained in:
Anand Doshi 2012-08-31 16:57:04 +05:30
commit eb3089e6e3

View File

@ -5,7 +5,7 @@
{ {
'creation': '2012-06-26 11:58:13', 'creation': '2012-06-26 11:58:13',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-08-31 13:14:16', 'modified': '2012-08-31 16:44:13',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -188,7 +188,7 @@
{ {
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'content', 'fieldname': u'content',
'fieldtype': u'Text Editor', 'fieldtype': u'Text',
'label': u'Content', 'label': u'Content',
'permlevel': 0, 'permlevel': 0,
'reqd': 0 'reqd': 0