audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Alexandre D. Díaz
2021-10-07 19:43:13 +02:00
committed by Carlos Roca
parent 50be7c0e47
commit ca6428db56
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web_time_range_menu_custom/__manifest__.py
View File

@@ -2,7 +2,7 @@
{
"name": "Web Time Range Menu Custom",
"version": "13.0.1.0.0",
"version": "13.0.1.0.1",
"author": "Tecnativa, Odoo Community Association (OCA)",
"license": "AGPL-3",
"website": "https://github.com/OCA/web",

15
web_time_range_menu_custom/static/src/js/control_panel_model.js
View File

@@ -52,6 +52,21 @@ odoo.define("web_time_range_menu_custom.ControlPanelModel", function(require) {
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") {
context.timeRangeMenuData.comparisonTimeRange = Domain.prototype.constructCustomDomain(