Merge branch 'master' of github.com:anandpdoshi/erpnext
Conflicts: erpnext/setup/doctype/email_digest/email_digest.py
This commit is contained in:
commit
e7982f0f85
@ -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
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user