From cb46a2df55fe995cd7cb2f7bb1c570bf97ea16dd Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 21:58:53 +0530 Subject: [PATCH 1/2] accounts_browser: fix for number formatting --- accounts/page/accounts_browser/accounts_browser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounts/page/accounts_browser/accounts_browser.py b/accounts/page/accounts_browser/accounts_browser.py index 7c8116c77c..4bcf7a4055 100644 --- a/accounts/page/accounts_browser/accounts_browser.py +++ b/accounts/page/accounts_browser/accounts_browser.py @@ -52,6 +52,6 @@ def get_children(): currency = webnotes.conn.sql("select default_currency from `tabCompany` where name = %s", company)[0][0] for each in acc: bal = get_balance_on(each.get("value")) - each['balance'] = currency + ' ' + fmt_money(bal) + each['balance'] = currency + ' ' + str(bal or 0) return acc From 28b0b1cba4a46e10ef86775e9147502d0f27c795 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Jan 2013 11:04:55 +0530 Subject: [PATCH 2/2] removed key_list in memcache --- website/utils.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/website/utils.py b/website/utils.py index 6963b76f5a..cd1b6a5974 100644 --- a/website/utils.py +++ b/website/utils.py @@ -267,8 +267,19 @@ def clear_cache(page_name=None): if page_name: delete_page_cache(page_name) else: - webnotes.cache().delete_keys("page:") - + cache = webnotes.cache() + for p in get_all_pages(): + cache.delete_value("page:" + p) + +def get_all_pages(): + all_pages = get_template_pages() + all_pages += page_settings_map.keys() + for doctype in page_map: + all_pages += [p[0] for p in webnotes.conn.sql("""select distinct page_name + from `tab%s`""" % doctype) if p[0]] + + return all_pages + def delete_page_cache(page_name): if page_name: webnotes.cache().delete_value("page:" + page_name)