vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into develop

Browse source
This commit is contained in:
mbauskar 2017-06-16 11:43:05 +05:30
commit cc5f94367c
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -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.68'
__version__ = '8.0.69'
__title__ = "Frappe Framework"
local = Local()

4
frappe/utils/data.py
View file

@ -442,7 +442,9 @@ def money_in_words(number, main_currency = None, fraction_currency=None):
fraction_length = get_number_format_info(number_format)[2]
n = "%.{0}f".format(fraction_length) % number
main, fraction = n.split('.')
numbers = n.split('.')
main, fraction = numbers if len(numbers) > 1 else [n, '00']
if len(fraction) < fraction_length:
zeros = '0' * (fraction_length - len(fraction))