Merge branch 'master' of github.com:anandpdoshi/erpnext

Conflicts:
	erpnext/setup/doctype/email_digest/email_digest.py
This commit is contained in:
Anand Doshi 2011-12-14 20:05:16 +05:30
commit e7982f0f85

View File

@ -121,7 +121,7 @@ class DocType:
#webnotes.msgprint(query)
#webnotes.msgprint(res)
result[query] = (res and len(res)==1) and res[0] or (res and res or None)
return result