From c152f3ead341137d9475d04200aaa807e25d3664 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 14 Nov 2014 16:45:04 +0530 Subject: [PATCH 1/3] fix for negative value in money_in_words --- frappe/utils/data.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 80de3ddab5..7d69f2bef4 100644 --- a/frappe/utils/data.py +++ b/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') From 4fb0700dc07a009bc5ef0394ebe04300433f1a9d Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Fri, 14 Nov 2014 17:55:32 +0530 Subject: [PATCH 2/3] [minor] fix msgprint from duplicate name --- frappe/model/base_document.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index c8c264354a..f335e843f4 100644 --- a/frappe/model/base_document.py +++ b/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 From 08317b8e0e195c0f78f689cb292ecf52e6c1ea65 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 17 Nov 2014 12:05:13 +0600 Subject: [PATCH 3/3] bumped to version 4.5.7 --- frappe/__version__.py | 2 +- frappe/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/__version__.py b/frappe/__version__.py index 933cd02a88..39be6071fd 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1 +1 @@ -__version__ = "4.5.6" +__version__ = "4.5.7" diff --git a/frappe/hooks.py b/frappe/hooks.py index e25d44d914..f3d3218de8 100644 --- a/frappe/hooks.py +++ b/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" diff --git a/setup.py b/setup.py index 6cbf9fe70f..a3508f40a9 100644 --- a/setup.py +++ b/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()