nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 22:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2017-12-06 14:17:51 +05:30
parent a160879159 7ff6e378dd
commit c84476bd27
10 changed files with 90 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,7 +232,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}:{2}".format(self.company, self.frequency, key)
cache_key = "email_digest:card:{0}:{1}:{2}:{3}".format(self.company, self.frequency, key, self.from_date)
card = cache.get(cache_key)
if card:

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

@@ -78,7 +78,7 @@ class ItemGroup(NestedSet, WebsiteGenerator):
@frappe.whitelist(allow_guest=True)
def get_product_list_for_group(product_group=None, start=0, limit=10, search=None):
child_groups = ", ".join(['"' + i[0] + '"' for i in get_child_groups(product_group)])
child_groups = ", ".join(['"' + frappe.db.escape(i[0]) + '"' for i in get_child_groups(product_group)])
# base query
query = """select I.name, I.item_name, I.item_code, I.route, I.image, I.website_image, I.thumbnail, I.item_group,