Support empty digits in format_number of Report
issue10678 review365801002
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
* Support empty digits in format_number of Report
|
||||
* Add digits mixin
|
||||
* Use argon2 or scrypt to hash password by default
|
||||
* Allow PYSON Expression as key for PYSON In with dict object
|
||||
|
||||
@@ -12,6 +12,8 @@ import time
|
||||
import warnings
|
||||
import zipfile
|
||||
import operator
|
||||
|
||||
from decimal import Decimal
|
||||
from email.mime.multipart import MIMEMultipart
|
||||
from email.mime.text import MIMEText
|
||||
from io import BytesIO
|
||||
@@ -439,12 +441,17 @@ class Report(URLMixin, PoolBase):
|
||||
return lang.currency(value, currency, symbol, grouping, digits=digits)
|
||||
|
||||
@classmethod
|
||||
def format_number(cls, value, lang, digits=2, grouping=True,
|
||||
monetary=None):
|
||||
def format_number(
|
||||
cls, value, lang, digits=None, grouping=True, monetary=None):
|
||||
pool = Pool()
|
||||
Lang = pool.get('ir.lang')
|
||||
if lang is None:
|
||||
lang = Lang.get()
|
||||
if digits is None:
|
||||
d = value
|
||||
if not isinstance(d, Decimal):
|
||||
d = Decimal(repr(value))
|
||||
digits = -int(d.as_tuple().exponent)
|
||||
return lang.format('%.' + str(digits) + 'f', value,
|
||||
grouping=grouping, monetary=monetary)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user