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

[HOTFIX] Currency Format on Print (#4584)

Browse source 
* [HOTFIX] fix currency issue on print

* [HOTFIX] fix currency issue on print

* added value check for format

* added value check for format

* fix codacy
This commit is contained in:
Achilles Rasquinha 2017-12-11 15:10:32 +05:30 • committed by Faris Ansari
parent 5927c67130
commit 79a8be3633
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/utils/data.py
View file

@ -371,12 +371,17 @@ def fmt_money(amount, precision=None, currency=None):
# 40,000 -> 40,000.00
# 40,000.00000 -> 40,000.00
# 40,000.23000 -> 40,000.23
if decimal_str:
parts = str(amount).split(decimal_str)
decimals = parts[1] if len(parts) > 1 else ''
if precision > 2:
if len(decimals) < 3:
precision = 2
if currency:
fraction = frappe.db.get_value("Currency", currency, "fraction_units") or 100
precision = len(cstr(fraction)) - 1
else:
precision = 2
elif len(decimals) < precision:
precision = len(decimals)
@ -781,7 +786,7 @@ def make_filter_tuple(doctype, key, value):
return [doctype, key, value[0], value[1]]
else:
return [doctype, key, "=", value]
def scrub_urls(html):
html = expand_relative_urls(html)
# encoding should be responsibility of the composer