From d9b8741cae5a06c95c59a37cb3a05e562f1e603c Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Tue, 23 Dec 2014 14:43:35 +0530 Subject: [PATCH 1/3] remove pytz version pinning --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 158e9b9895..32f65b6db7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ mysql-python==1.2.5 pygeoip python-dateutil python-memcached -pytz==2013d +pytz six slugify termcolor From ab286a89be4fda717ae191cea2d89bb96781a9e8 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 23 Dec 2014 14:54:35 +0530 Subject: [PATCH 2/3] [fix] Use df.precision if specified --- frappe/model/meta.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/model/meta.py b/frappe/model/meta.py index 0a65f5e4c5..3d208a8985 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -258,9 +258,10 @@ def get_field_precision(df, doc): """get precision based on DocField options and fieldvalue in doc""" from frappe.utils import get_number_format_info - precision = cint(df.precision) or cint(frappe.db.get_default("float_precision")) or 3 + if cint(df.precision): + precision = cint(df.precision) - if df.fieldtype == "Currency": + elif df.fieldtype == "Currency": number_format = None currency = get_field_currency(df, doc) @@ -276,6 +277,9 @@ def get_field_precision(df, doc): decimal_str, comma_str, precision = get_number_format_info(number_format) + else: + precision = cint(frappe.db.get_default("float_precision")) or 3 + return precision def clear_cache(doctype=None): From f3cc20a62facf110a6eac2a4efd13647a328eac8 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Tue, 23 Dec 2014 15:51:02 +0600 Subject: [PATCH 3/3] bumped to version 4.9.1 --- 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 454a2edae2..0139b2ebd5 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1 +1 @@ -__version__ = "4.9.0" +__version__ = "4.9.1" diff --git a/frappe/hooks.py b/frappe/hooks.py index 9e16230a9e..65ef10bc7c 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.9.0" +app_version = "4.9.1" app_color = "#3498db" app_email = "support@frappe.io" diff --git a/setup.py b/setup.py index 2d5d95459e..4874708752 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.9.0" +version = "4.9.1" with open("requirements.txt", "r") as f: install_requires = f.readlines()