From 53410da351cc14a152f181d00b9abea4151b836f Mon Sep 17 00:00:00 2001
From: MerlinGuillaume <megu@odoo.com>
Date: Fri, 26 Aug 2022 08:26:48 +0000
Subject: [PATCH] [REV] web: do not use number format in exported group header
for floats
Reverts [this commit] because it modified the format of float numbers in
exported xlsx files and we want to avoid introducing an error or
unwanted behavior in version 13, for which support will soon come to an
end.
[this commit]:https://github.com/odoo/odoo/commit/27ab24214dabfafc652280f680f7a650e7d98d2b
closes odoo/odoo#98975
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
---
addons/test_xlsx_export/tests/test_export.py | 38 +++++++++-----------
addons/web/controllers/main.py | 34 ++++++++++--------
2 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/addons/test_xlsx_export/tests/test_export.py b/addons/test_xlsx_export/tests/test_export.py
index 6722e7a23e62..deea378b6982 100644
--- a/addons/test_xlsx_export/tests/test_export.py
+++ b/addons/test_xlsx_export/tests/test_export.py
@@ -37,12 +37,7 @@ class XlsxCreatorCase(common.HttpCase):
}
def _mock_write(self, row, column, value, style=None):
- if isinstance(value, float):
- decimal_places = style.num_format[::-1].find('.')
- style_format = "{:." + str(decimal_places) + "f}"
- self.worksheet[row, column] = style_format.format(value)
- else:
- self.worksheet[row, column] = str(value)
+ self.worksheet[row, column] = str(value)
def make(self, values, context=None):
return self.model.with_context(**(context or {})).create(values)
@@ -77,7 +72,6 @@ class XlsxCreatorCase(common.HttpCase):
class TestGroupedExport(XlsxCreatorCase):
model_name = 'export.group_operator'
- # pylint: disable=bad-whitespace
def test_int_sum_max(self):
values = [
@@ -124,12 +118,12 @@ class TestGroupedExport(XlsxCreatorCase):
['Int Sum' ,'Float Min'],
['10 (2)' ,'111.00'],
[' 111.0 (1)','111.00'],
- ['10' ,'111.00'],
+ ['10' ,'111.0'],
[' 222.0 (1)','222.00'],
- ['10' ,'222.00'],
+ ['10' ,'222.0'],
['20 (1)' ,'333.00'],
[' 333.0 (1)','333.00'],
- ['20' ,'333.00'],
+ ['20' ,'333.0'],
])
def test_float_avg(self):
@@ -144,12 +138,12 @@ class TestGroupedExport(XlsxCreatorCase):
['Int Sum' ,'Float Avg'],
['10 (2)' ,'150.00'],
[' 100.0 (1)','100.00'],
- ['10' ,'100.00'],
+ ['10' ,'100.0'],
[' 200.0 (1)','200.00'],
- ['10' ,'200.00'],
+ ['10' ,'200.0'],
['20 (1)' ,'300.00'],
[' 300.0 (1)','300.00'],
- ['20' ,'300.00'],
+ ['20' ,'300.0'],
])
def test_float_avg_nested(self):
@@ -166,12 +160,12 @@ class TestGroupedExport(XlsxCreatorCase):
['10 (3)' ,'300.00'],
[' 20 (1)' ,'600.00'],
[' 600.0 (1)','600.00'],
- ['10' ,'600.00'],
+ ['10' ,'600.0'],
[' 30 (2)' ,'150.00'],
[' 100.0 (1)','100.00'],
- ['10' ,'100.00'],
+ ['10' ,'100.0'],
[' 200.0 (1)','200.00'],
- ['10' ,'200.00'],
+ ['10' ,'200.0'],
])
def test_float_avg_nested_no_value(self):
@@ -188,11 +182,11 @@ class TestGroupedExport(XlsxCreatorCase):
['10 (3)' ,'0.00'],
[' 20 (1)' ,'0.00'],
[' Undefined (1)','0.00'],
- ['10' ,'0.00'],
+ ['10' ,'0.0'],
[' 30 (2)' ,'0.00'],
[' Undefined (2)','0.00'],
- ['10' ,'0.00'],
- ['10' ,'0.00'],
+ ['10' ,'0.0'],
+ ['10' ,'0.0'],
])
def test_date_max(self):
@@ -366,11 +360,11 @@ class TestGroupedExport(XlsxCreatorCase):
['Int Sum', 'Float Monetary'],
['1 (1)','60739.200'],
[' 60739.2 (1)','60739.200'],
- ['1','60739.20'],
+ ['1','60739.2'],
['2 (1)','2.000'],
[' 2.0 (1)','2.000'],
- ['2','2.00'],
+ ['2','2.0'],
['3 (1)','1000.000'],
[' 1000.0 (1)','1000.000'],
- ['3','1000.00'],
+ ['3','1000.0'],
])
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index dc36ed510be8..b6e5cf3f1fac 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -35,10 +35,10 @@ import odoo
import odoo.modules.registry
from odoo.api import call_kw, Environment
from odoo.modules import get_module_path, get_resource_path
-from odoo.tools import image_process, topological_sort, html_escape, pycompat, ustr, apply_inheritance_specs, lazy_property
+from odoo.tools import image_process, topological_sort, html_escape, pycompat, ustr, apply_inheritance_specs, lazy_property, float_repr
from odoo.tools.mimetypes import guess_mimetype
from odoo.tools.translate import _
-from odoo.tools.misc import str2bool, xlsxwriter, file_open, get_lang
+from odoo.tools.misc import str2bool, xlsxwriter, file_open
from odoo.tools.safe_eval import safe_eval
from odoo import http, tools
from odoo.http import content_disposition, dispatch_rpc, request, serialize_exception as _serialize_exception, Response
@@ -738,10 +738,6 @@ class ExportXlsxWriter:
self.datetime_style = self.workbook.add_format({'text_wrap': True, 'num_format': 'yyyy-mm-dd hh:mm:ss'})
self.worksheet = self.workbook.add_worksheet()
self.value = False
- decimal_separator = get_lang(request.env).decimal_point
- self.float_format = f'0{decimal_separator}00'
- decimal_places = [res['decimal_places'] for res in request.env['res.currency'].search_read([], ['decimal_places'])]
- self.monetary_format = f'0{decimal_separator}{max(decimal_places or [2]) * "0"}'
if row_count > self.worksheet.xls_rowmax:
raise UserError(_('There are too many rows (%s rows, limit: %s) to export as Excel 2007-2013 (.xlsx) format. Consider splitting the export.') % (row_count, self.worksheet.xls_rowmax))
@@ -789,8 +785,6 @@ class ExportXlsxWriter:
cell_style = self.datetime_style
elif isinstance(cell_value, datetime.date):
cell_style = self.date_style
- elif isinstance(cell_value, float):
- cell_style.set_num_format(self.float_format)
self.write(row, column, cell_value, cell_style)
class GroupExportXlsxWriter(ExportXlsxWriter):
@@ -824,16 +818,26 @@ class GroupExportXlsxWriter(ExportXlsxWriter):
label = '%s%s (%s)' % (' ' * group_depth, label, group.count)
self.write(row, column, label, self.header_bold_style)
+ if any(f.get('type') == 'monetary' for f in self.fields[1:]):
+
+ decimal_places = [res['decimal_places'] for res in group._model.env['res.currency'].search_read([], ['decimal_places'])]
+ decimal_places = max(decimal_places) if decimal_places else 2
for field in self.fields[1:]: # No aggregates allowed in the first column because of the group title
column += 1
aggregated_value = aggregates.get(field['name'])
- if field.get('type') == 'monetary':
- self.header_bold_style.set_num_format(self.monetary_format)
- elif field.get('type') == 'float':
- self.header_bold_style.set_num_format(self.float_format)
- else:
- aggregated_value = str(aggregated_value if aggregated_value is not None else '')
- self.write(row, column, aggregated_value, self.header_bold_style)
+ # Float fields may not be displayed properly because of float
+ # representation issue with non stored fields or with values
+ # that, even stored, cannot be rounded properly and it is not
+ # acceptable to display useless digits (i.e. monetary)
+ #
+ # non stored field -> we force 2 digits
+ # stored monetary -> we force max digits of installed currencies
+ if isinstance(aggregated_value, float):
+ if field.get('type') == 'monetary':
+ aggregated_value = float_repr(aggregated_value, decimal_places)
+ elif not field.get('store'):
+ aggregated_value = float_repr(aggregated_value, 2)
+ self.write(row, column, str(aggregated_value if aggregated_value is not None else ''), self.header_bold_style)
return row + 1, 0
--
GitLab