mirror of
https://github.com/frappe/erpnext.git
synced 2026-09-19 03:17:55 +00:00
Merge branch 'master' of github.com:anandpdoshi/erpnext
Conflicts: erpnext/setup/doctype/email_digest/email_digest.py
This commit is contained in:
@@ -121,7 +121,7 @@ class DocType:
|
|||||||
#webnotes.msgprint(query)
|
#webnotes.msgprint(query)
|
||||||
#webnotes.msgprint(res)
|
#webnotes.msgprint(res)
|
||||||
result[query] = (res and len(res)==1) and res[0] or (res and res or None)
|
result[query] = (res and len(res)==1) and res[0] or (res and res or None)
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user