Merge branch 'develop'

frappe/__version__.py

@@ -1 +1 @@
-__version__ = "4.5.6"
+__version__ = "4.5.7"

frappe/hooks.py

@@ -3,7 +3,7 @@ app_title = "Frappe Framework"
 app_publisher = "Web Notes Technologies Pvt. Ltd."
 app_description = "Full Stack Web Application Framework in Python"
 app_icon = "assets/frappe/images/frappe.svg"
-app_version = "4.5.6"
+app_version = "4.5.7"
 app_color = "#3498db"
 app_email = "support@frappe.io"
 

frappe/model/base_document.py

@@ -203,7 +203,7 @@ class BaseDocument(object):
 		except Exception, e:
 			if e.args[0]==1062:
 				type, value, traceback = sys.exc_info()
-				frappe.msgprint(_("Duplicate name {0} {1}".format(self.doctype, self.name)))
+				frappe.msgprint(_("Duplicate name {0} {1}").format(self.doctype, self.name))
 				raise frappe.NameError, (self.doctype, self.name, e), traceback
 			else:
 				raise

frappe/utils/data.py

@@ -325,6 +325,9 @@ def money_in_words(number, main_currency = None, fraction_currency=None):
 	"""
 	from frappe.utils import get_defaults
 
+	if not number or flt(number) < 0:
+		return ""
+
 	d = get_defaults()
 	if not main_currency:
 		main_currency = d.get('currency', 'INR')

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "4.5.6"
+version = "4.5.7"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()