From 85851d10d588cb52d4b2ff91150da9572257303e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 15 Jun 2017 15:36:43 +0530 Subject: [PATCH 1/2] get correct number format info in in_words function --- frappe/utils/data.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index f28c321f0b..804beca370 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -437,8 +437,9 @@ def money_in_words(number, main_currency = None, fraction_currency=None): number_format = frappe.db.get_value("Currency", main_currency, "number_format", cache=True) or \ frappe.db.get_default("number_format") or "#,###.##" + + fraction_length = get_number_format_info(number_format)[2] - fraction_length = len(number_format.rsplit('.', 1)[-1]) n = "%.{0}f".format(fraction_length) % number main, fraction = n.split('.') From 68a8f2b954fae92a19ba8b6453030b3f14b7b959 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Thu, 15 Jun 2017 16:34:51 +0600 Subject: [PATCH 2/2] bumped to version 8.0.68 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 7e89057d02..a45ce2f9bd 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = '8.0.67' +__version__ = '8.0.68' __title__ = "Frappe Framework" local = Local()