Merge branch 'develop'

This commit is contained in:
Nabin Hait 2015-07-30 14:57:34 +05:30
commit 9e948850d5
4 changed files with 4 additions and 4 deletions

View file

@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = "5.2.0"
__version__ = "5.2.1"

View file

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

View file

@ -29,7 +29,7 @@ def get_random(doctype, filters=None):
condition = []
if filters:
for key, val in filters.items():
condition.append("%s='%s'" % (key, val.replace("'", "\'")))
condition.append("%s='%s'" % (key, str(val).replace("'", "\'")))
if condition:
condition = " where " + " and ".join(condition)
else:

View file

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