Merge branch 'master' of git://github.com/rmehta/wnframework

.gitignore

@@ -1,3 +1,4 @@
 *.pyc
 *.comp.js
 *.DS_Store
+defs.py

cgi-bin/webnotes/model/doctype.py

@@ -140,7 +140,7 @@ class _DocType:
 		fields = {}
 		for d in doclist:
 			if d['doctype']=='DocField':
-				if d['fieldname'] or d['label']:
+				if d.get('fieldname') or d.get('label'):
 					fields[d['fieldname'] or d['label']] = d
 		return fields