Merge branch 'develop'

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "5.0.30"
+__version__ = "5.0.31"

frappe/hooks.py

@@ -4,7 +4,7 @@ app_title = "Frappe Framework"
 app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = "Full Stack Web Application Framework in Python"
 app_icon = "octicon octicon-circuit-board"
-app_version = "5.0.30"
+app_version = "5.0.31"
 app_color = "orange"
 
 app_email = "support@frappe.io"

frappe/model/db_query.py

@@ -297,7 +297,7 @@ class DatabaseQuery(object):
 
 				# share is an OR condition, if there is a role permission
 				if not only_if_shared and self.shared:
-					self.match_conditions.append(" or {0}".format(self.get_share_condition()))
+					self.match_conditions.append(self.get_share_condition())
 
 		if as_condition:
 			conditions = ""

setup.py

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