Merge PR #483 into 14.0

Signed-off-by pedrobaeza
pull/548/head
OCA-git-bot 2021-11-08 07:17:32 +00:00
commit aefd369070
1 changed files with 10 additions and 0 deletions

View File

@ -723,6 +723,7 @@ class ReportXlsxAbstract(models.AbstractModel):
if isinstance(cell_format, CodeType):
cell_format = self._eval(cell_format, render_space)
args_data.append(cell_format)
self._apply_formula_quirk(args_data, cell_type, cell_format)
if colspan > 1:
args_pos += [row_pos, pos + colspan - 1]
args = args_pos + args_data
@ -735,6 +736,15 @@ class ReportXlsxAbstract(models.AbstractModel):
return row_pos + 1
@staticmethod
def _apply_formula_quirk(args_data, cell_type, cell_format):
""" Insert empty value to force LibreOffice to recompute the value """
if cell_type == "formula":
if not cell_format:
# Insert positional argument for missing format
args_data.append(None)
args_data.append("")
@staticmethod
def _render(code):
return compile(code, "<string>", "eval")