Merge branch 'master' of github.com:anandpdoshi/erpnext
Conflicts:
erpnext/setup/doctype/email_digest/email_digest.py
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index 4e5a27b..5b76024 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -109,20 +109,19 @@
result = {}
for query in query_dict.keys():
- if self.doc.fields[query]:
- if query_dict[query]:
- #webnotes.msgprint(query)
- res = webnotes.conn.sql(query_dict[query], as_dict=1)
- if query == 'income':
- for r in res:
- r['value'] = float(r['credit'] - r['debit'])
- elif query in ['expenses_booked', 'bank_balance']:
- for r in res:
- r['value'] = float(r['debit'] - r['credit'])
- #webnotes.msgprint(query)
- #webnotes.msgprint(res)
- result[query] = (res and len(res)==1) and res[0] or (res and res or None)
-
+ if self.doc.fields[query] and query_dict[query]:
+ #webnotes.msgprint(query)
+ res = webnotes.conn.sql(query_dict[query], as_dict=1)
+ if query == 'income':
+ for r in res:
+ r['value'] = float(r['credit'] - r['debit'])
+ elif query in ['expenses_booked', 'bank_balance']:
+ for r in res:
+ r['value'] = float(r['debit'] - r['credit'])
+ #webnotes.msgprint(query)
+ #webnotes.msgprint(res)
+ result[query] = (res and len(res)==1) and res[0] or (res and res or None)
+
return result