Merge branch 'develop'

frappe/__version__.py

@@ -1 +1 @@
-__version__ = "4.9.0"
+__version__ = "4.9.1"

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"
 

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):

requirements.txt

@@ -10,7 +10,7 @@ mysql-python==1.2.5
 pygeoip
 python-dateutil
 python-memcached
-pytz==2013d
+pytz
 six
 slugify
 termcolor

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()