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

fix: Show default currency as a fallback for currency fieldtype (#8944)

Browse source 
* fix: Show default currency as a fallback for currency fieldtype

* test: Add a test for currency formatting
This commit is contained in:
Suraj Shetty 2019-12-14 17:34:04 +05:30 • committed by GitHub
parent e5c1f80071
commit 310233c56a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
frappe/tests/test_formatter.py Normal file
View file

@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
import frappe
from frappe import format
import unittest
class TestFormatter(unittest.TestCase):
def test_currency_formatting(self):
df = frappe._dict({
'fieldname': 'amount',
'fieldtype': 'Currency',
'options': 'currency'
})
doc = frappe._dict({
'amount': 5
})
frappe.db.set_default("currency", 'INR')
# if currency field is not passed then default currency should be used.
self.assertEqual(format(100, df, doc), '₹ 100.00')
doc.currency = 'USD'
self.assertEqual(format(100, df, doc), "$ 100.00")
frappe.db.set_default("currency", None)

11
frappe/utils/formatters.py
View file

@ -55,12 +55,15 @@ def format_value(value, df=None, doc=None, currency=None, translated=False):
# this is required to show 0 as blank in table columns
return ""
elif df.get("fieldtype") == "Currency" or (df.get("fieldtype")=="Float" and (df.options or "").strip()):
return fmt_money(value, precision=get_field_precision(df, doc),
currency=currency if currency else (get_field_currency(df, doc) if doc else None))
elif df.get("fieldtype") == "Currency":
default_currency = frappe.db.get_default("currency")
currency = currency or get_field_currency(df, doc) or default_currency
return fmt_money(value, precision=get_field_precision(df, doc), currency=currency)
elif df.get("fieldtype") == "Float":
precision = get_field_precision(df, doc)
# I don't know why we support currency option for float
currency = currency or get_field_currency(df, doc)
# show 1.000000 as 1
# options should not specified
@ -69,7 +72,7 @@ def format_value(value, df=None, doc=None, currency=None, translated=False):
if len(temp)==1 or cint(temp[1])==0:
precision = 0
return fmt_money(value, precision=precision)
return fmt_money(value, precision=precision, currency=currency)
elif df.get("fieldtype") == "Percent":
return "{}%".format(flt(value, 2))