Merge PR #1589 into 12.0

Signed-off-by pedrobaeza
2020-04-23 07:51:52 +00:00 · 2020-04-23 07:51:52 +00:00 · 356451b1f4
parent 2a1efdce1c e2255afe4e
commit 356451b1f4
1 changed files with 10 additions and 10 deletions
--- a/web_pivot_computed_measure/static/src/js/pivot_controller.js
+++ b/web_pivot_computed_measure/static/src/js/pivot_controller.js
@ -12,10 +12,10 @@ odoo.define('web_pivot_computed_measure.PivotController', function (require) {
    PivotController.include({
-        custom_events: {
+        custom_events: _.extend({}, PivotController.prototype.custom_events, {
-            'add_measure': '_onAddMeasure',
+            add_measure: '_onAddMeasure',
-            'remove_measure': '_onRemoveMeasure',
+            remove_measure: '_onRemoveMeasure',
-        },
+        }),
        computed_measures_open: false,