fix pivot insertion handler

odoo · Apr 22, 2024 · 248d623 · 248d623
1 parent 7dcc8e4
commit 248d623
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/helpers/pivot/pivot_helpers.ts b/src/helpers/pivot/pivot_helpers.ts
@@ -136,6 +136,11 @@ export const ALL_PERIODS = {
   month: _t("Month"),
   week: _t("Week"),
   day: _t("Day"),
+  year_number: _t("Year"),
+  quarter_number: _t("Quarter"),
+  month_number: _t("Month"),
+  iso_week_number: _t("Week"),
+  day_of_month: _t("Day of Month"),
 };
 
 const DATE_FIELDS = ["date", "datetime"];

diff --git a/src/plugins/ui_feature/insert_pivot.ts b/src/plugins/ui_feature/insert_pivot.ts
@@ -19,12 +19,12 @@ export class InsertPivotPlugin extends UIPlugin {
     if (getZoneArea(this.getters.getSelectedZone()) === 1) {
       this.selection.selectTableAroundSelection();
     }
-
+    const currentSheetId = this.getters.getActiveSheetId();
     this.dispatch("ADD_PIVOT", {
       pivotId,
       pivot: {
         zone: this.getters.getSelectedZone(),
-        sheetId,
+        sheetId: currentSheetId,
         columns: [],
         rows: [],
         measures: [],
@@ -34,17 +34,15 @@ export class InsertPivotPlugin extends UIPlugin {
     });
 
     const position =
-      this.getters
-        .getSheetIds()
-        .findIndex((sheetId) => sheetId === this.getters.getActiveSheetId()) + 1;
+      this.getters.getSheetIds().findIndex((sheetId) => sheetId === currentSheetId) + 1;
     const formulaId = this.getters.getPivotFormulaId(pivotId);
     this.dispatch("CREATE_SHEET", {
       sheetId,
       name: _t("Pivot #%s", formulaId),
       position,
     });
     this.dispatch("ACTIVATE_SHEET", {
-      sheetIdFrom: this.getters.getActiveSheetId(),
+      sheetIdFrom: currentSheetId,
       sheetIdTo: sheetId,
     });
     this.dispatch("UPDATE_CELL", {