CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 09:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	erpnext/setup/doctype/email_digest/email_digest.py
This commit is contained in:
Anand Doshi
2011-12-14 20:05:16 +05:30
parent ddf4c2655d 3fe9795020
commit e7982f0f85
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/doctype/email_digest/email_digest.py
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