nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-14 09:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-12-06 16:16:58 +05:30
parent cc43c2f5aa 5c3564143b
commit 5c18bd9b61
23 changed files with 134 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/doctype/email_digest/email_digest.py
View File

@@ -233,7 +233,7 @@ class EmailDigest(Document):
"new_quotations","pending_quotations","sales_order","purchase_order","pending_sales_orders","pending_purchase_orders",
"invoiced_amount", "payables", "bank_balance", "credit_balance"):
if self.get(key):
cache_key = "email_digest:card:{0}:{1}".format(self.company, key)
cache_key = "email_digest:card:{0}:{1}:{2}".format(self.company, self.frequency, key)
card = cache.get(cache_key)
if card: