Merge PR #482 into 13.0

Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2021-02-09 22:10:17 +00:00

View File

@@ -636,6 +636,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
@@ -648,6 +649,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")