Ver código fonte

Merge branch 'hotfix'

version-14
mbauskar 8 anos atrás
pai
commit
39a1496ccf
2 arquivos alterados com 4 adições e 2 exclusões
  1. +1
    -1
      frappe/__init__.py
  2. +3
    -1
      frappe/utils/data.py

+ 1
- 1
frappe/__init__.py Ver arquivo

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


+ 3
- 1
frappe/utils/data.py Ver arquivo

@@ -441,7 +441,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))


Carregando…
Cancelar
Salvar