From 090dc24ca53ac6479a52534068ecda3baebff536 Mon Sep 17 00:00:00 2001 From: Saran440 Date: Wed, 22 Jan 2020 10:43:25 +0700 Subject: [PATCH 1/2] [12.0][ENH] report_xlsx_helper : dynamic function _write_line --- report_xlsx_helper/readme/CONTRIBUTORS.rst | 2 ++ report_xlsx_helper/report/report_xlsx_abstract.py | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/report_xlsx_helper/readme/CONTRIBUTORS.rst b/report_xlsx_helper/readme/CONTRIBUTORS.rst index 56577cc51..dbf4d75b2 100644 --- a/report_xlsx_helper/readme/CONTRIBUTORS.rst +++ b/report_xlsx_helper/readme/CONTRIBUTORS.rst @@ -1,2 +1,4 @@ * Luc De Meyer * Rattapong Chokmasermkul +* Saran Lim. + diff --git a/report_xlsx_helper/report/report_xlsx_abstract.py b/report_xlsx_helper/report/report_xlsx_abstract.py index 375fca823..26c7f8917 100644 --- a/report_xlsx_helper/report/report_xlsx_abstract.py +++ b/report_xlsx_helper/report/report_xlsx_abstract.py @@ -569,6 +569,8 @@ class ReportXlsxAbstract(models.AbstractModel): col_specs_section=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'. @@ -576,8 +578,8 @@ class ReportXlsxAbstract(models.AbstractModel): An empty cell will be written if no col_specs_section entry for a column. """ - col_specs = ws_params.get("col_specs") - wl = ws_params.get("wanted_list") or [] + col_specs = ws_params.get(col_specs) + wl = ws_params.get(wanted_list) or [] pos = 0 for col in wl: if col not in col_specs: From 8f2a2d14d106406950d2ec7a10098c7694859f06 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Thu, 20 Feb 2020 19:49:36 +0100 Subject: [PATCH 2/2] greenify --- report_xlsx_helper/readme/CONTRIBUTORS.rst | 1 - report_xlsx_helper/report/report_xlsx_abstract.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/report_xlsx_helper/readme/CONTRIBUTORS.rst b/report_xlsx_helper/readme/CONTRIBUTORS.rst index dbf4d75b2..9df1ce27b 100644 --- a/report_xlsx_helper/readme/CONTRIBUTORS.rst +++ b/report_xlsx_helper/readme/CONTRIBUTORS.rst @@ -1,4 +1,3 @@ * Luc De Meyer * Rattapong Chokmasermkul * Saran Lim. - diff --git a/report_xlsx_helper/report/report_xlsx_abstract.py b/report_xlsx_helper/report/report_xlsx_abstract.py index 26c7f8917..479560ae1 100644 --- a/report_xlsx_helper/report/report_xlsx_abstract.py +++ b/report_xlsx_helper/report/report_xlsx_abstract.py @@ -569,8 +569,8 @@ class ReportXlsxAbstract(models.AbstractModel): col_specs_section=None, render_space=None, default_format=None, - col_specs='col_specs', - wanted_list='wanted_list', + col_specs="col_specs", + wanted_list="wanted_list", ): """ Write a line with all columns included in the 'wanted_list'.