Merge branch 'develop'

frappe/__init__.py

@@ -1045,7 +1045,7 @@ def publish_realtime(*args, **kwargs):
 
 	return frappe.async.publish_realtime(*args, **kwargs)
 
-def local_cache(namespace, key, generator):
+def local_cache(namespace, key, generator, regenerate_if_none=False):
 	"""A key value store for caching within a request
 
 	:param namespace: frappe.local.cache[namespace]
@@ -1059,4 +1059,8 @@ def local_cache(namespace, key, generator):
 	if key not in local.cache[namespace]:
 		local.cache[namespace][key] = generator()
 
+	elif local.cache[namespace][key]==None and regenerate_if_none:
+		# if key exists but the previous result was None
+		local.cache[namespace][key] = generator()
+
 	return local.cache[namespace][key]

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.6.0"
+__version__ = "6.6.1"

frappe/hooks.py

@@ -26,7 +26,7 @@ to ERPNext.
 """
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "6.6.0"
+app_version = "6.6.1"
 app_color = "orange"
 github_link = "https://github.com/frappe/frappe"
 

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.6.0"
+version = "6.6.1"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()