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

Merge PR #373 into 13.0 

Signed-off-by lmignon
pull/366/head
OCA-git-bot 2020-02-21 07:42:36 +00:00
parent 51b287a3ee 8f2a2d14d1
commit d2dc9cab88
2 changed files with 5 additions and 2 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,2 +1,3 @@
* Luc De Meyer <luc.demeyer@noviat.com> * Luc De Meyer <luc.demeyer@noviat.com>
* Rattapong Chokmasermkul <rattapongc@ecosoft.co.th> * Rattapong Chokmasermkul <rattapongc@ecosoft.co.th>
* Saran Lim. <saranl@ecosoft.co.th>

6
report_xlsx_helper/report/report_xlsx_abstract.py
View File

@ -569,6 +569,8 @@ class ReportXlsxAbstract(models.AbstractModel):
col_specs_section=None, col_specs_section=None,
render_space=None, render_space=None,
default_format=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'.
@ -576,8 +578,8 @@ class ReportXlsxAbstract(models.AbstractModel):
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: