Techsystech
/
OCA_Reporting_engine_17.0
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #364 into 12.0 

Signed-off-by lmignon
pull/376/head
OCA-git-bot 2020-02-19 14:39:34 +00:00
parent bc2c9e96bd 8d305722e1
commit 067f27e808
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
report_xlsx_helper/readme/CONTRIBUTORS.rst
View File

@ -1 +1,2 @@
* Luc De Meyer <luc.demeyer@noviat.com> * Luc De Meyer <luc.demeyer@noviat.com>
* Saran Lim. <saranl@ecosoft.co.th>

7
report_xlsx_helper/report/report_xlsx_abstract.py
View File

@ -464,15 +464,16 @@ class ReportXlsxAbstract(models.AbstractModel):
return row_pos + 2 return row_pos + 2
def _write_line(self, ws, row_pos, ws_params, col_specs_section=None, def _write_line(self, ws, row_pos, ws_params, col_specs_section=None,
render_space=None, default_format=None): render_space=None, default_format=None,
col_specs='col_specs', wanted_list='wanted_list'):
""" """
Write a line with all columns included in the 'wanted_list'. Write a line with all columns included in the 'wanted_list'.
Use the entry defined by the col_specs_section. Use the entry defined by the col_specs_section.
An empty cell will be written if no col_specs_section entry An empty cell will be written if no col_specs_section entry
for a column. for a column.
""" """
col_specs = ws_params.get('col_specs') col_specs = ws_params.get(col_specs)
wl = ws_params.get('wanted_list') or [] wl = ws_params.get(wanted_list) or []
pos = 0 pos = 0
for col in wl: for col in wl:
if col not in col_specs: if col not in col_specs: