Skip to content

Commit 38c7949

Browse files
committed
[FIX] applied sbidoul comments
1 parent c388fe2 commit 38c7949

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

mis_builder/models/kpimatrix.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -432,19 +432,19 @@ def compute_sums(self):
432432
tooltips=False,
433433
)
434434

435-
def iter_rows(self, inverse_detail=False):
435+
def iter_rows(self, details_before_kpi=False):
436436
"""Iterate rows in display order.
437437
438438
yields KpiMatrixRow.
439439
"""
440440
for kpi_row in self._kpi_rows.values():
441-
if not inverse_detail:
441+
if not details_before_kpi:
442442
yield kpi_row
443443
detail_rows = self._detail_rows[kpi_row.kpi].values()
444444
detail_rows = sorted(detail_rows, key=lambda r: r.label)
445445
for detail_row in detail_rows:
446446
yield detail_row
447-
if inverse_detail:
447+
if details_before_kpi:
448448
yield kpi_row
449449

450450
def iter_cols(self):
@@ -483,7 +483,7 @@ def get_account_name(self, account_id):
483483
self._load_account_names()
484484
return self._account_names[account_id]
485485

486-
def as_dict(self, inverse_detail=False):
486+
def as_dict(self, details_before_kpi=False):
487487
header = [{"cols": []}, {"cols": []}]
488488
for col in self.iter_cols():
489489
header[0]["cols"].append(
@@ -503,7 +503,7 @@ def as_dict(self, inverse_detail=False):
503503
)
504504

505505
body = []
506-
for row in self.iter_rows(inverse_detail=inverse_detail):
506+
for row in self.iter_rows(details_before_kpi=details_before_kpi):
507507
if (
508508
row.style_props.hide_empty and row.is_empty()
509509
) or row.style_props.hide_always:

mis_builder/models/mis_report_instance.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -563,8 +563,8 @@ def _compute_pivot_date(self):
563563
display_columns_description = fields.Boolean(
564564
help="Display the date range details in the column headers."
565565
)
566-
inverse_detail = fields.Boolean(
567-
help="Show detail before KPI.",
566+
details_before_kpi = fields.Boolean(
567+
help="Show account details before KPI.",
568568
)
569569
comparison_mode = fields.Boolean(
570570
compute="_compute_comparison_mode", inverse="_inverse_comparison_mode"
@@ -872,7 +872,7 @@ def _compute_matrix(self):
872872
def compute(self):
873873
self.ensure_one()
874874
kpi_matrix = self._compute_matrix()
875-
return kpi_matrix.as_dict(inverse_detail=self.inverse_detail)
875+
return kpi_matrix.as_dict(details_before_kpi=self.details_before_kpi)
876876

877877
def drilldown(self, arg):
878878
self.ensure_one()

mis_builder/report/mis_report_instance_qweb.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</div>
7676
<div class="mis_tbody">
7777
<t
78-
t-foreach="matrix.iter_rows(o.inverse_detail)"
78+
t-foreach="matrix.iter_rows(o.details_before_kpi)"
7979
t-as="row"
8080
>
8181
<div

mis_builder/report/mis_report_instance_xlsx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def generate_xlsx_report(self, workbook, data, objects):
102102
row_pos += 1
103103

104104
# rows
105-
for row in matrix.iter_rows(objects.inverse_detail):
105+
for row in matrix.iter_rows(objects.details_before_kpi):
106106
if (
107107
row.style_props.hide_empty and row.is_empty()
108108
) or row.style_props.hide_always:

mis_builder/views/mis_report_instance.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@
190190
<group name="layout">
191191
<field name="landscape_pdf" />
192192
<field name="no_auto_expand_accounts" />
193+
<field name="details_before_kpi" attrs="{'invisible': [('no_auto_expand_accounts', '=', True)]}" />
193194
<field name="display_columns_description" />
194195
<field name="hide_analytic_filters" />
195196
<field name="inverse_detail" />

0 commit comments

Comments
 (0)