3
0
Fork 0

[FIX] web_time_range_menu_custom: Mix custom and 'no custom' periods

Steps to reproduce:

- Go to pivot view
- Select a custom time range
- Select a predefined comparison period (Ex. Previous Period)

Now you see that the comparison period is not being applied.
After this commit the comparison period is applied correctly.

TT29249
13.0
Alexandre D. Díaz 2021-10-07 19:43:13 +02:00
parent 6391a7b919
commit d8e437563e
1 changed files with 15 additions and 0 deletions

View File

@ -52,6 +52,21 @@ odoo.define("web_time_range_menu_custom.ControlPanelModel", function(require) {
context.timeRangeMenuData.timeRange context.timeRangeMenuData.timeRange
); );
} }
if (filter.comparisonTimeRangeId !== "custom_comparison_period") {
context.timeRangeMenuData.comparisonTimeRange = Domain.prototype.constructCustomDomain(
filter.fieldName,
filter.timeRangeId,
filter.fieldType,
filter.comparisonTimeRangeId,
filter.timeRangeCustom,
filter.comparisonTimeRangeCustom
);
if (evaluation) {
context.timeRangeMenuData.comparisonTimeRange = Domain.prototype.stringToArray(
context.timeRangeMenuData.comparisonTimeRange
);
}
}
} }
if (filter.comparisonTimeRangeId === "custom_comparison_period") { if (filter.comparisonTimeRangeId === "custom_comparison_period") {
context.timeRangeMenuData.comparisonTimeRange = Domain.prototype.constructCustomDomain( context.timeRangeMenuData.comparisonTimeRange = Domain.prototype.constructCustomDomain(