diff options
| author | Vincent Schippefilt <vsc@odoo.com> | 2019-03-06 14:02:20 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2019-03-06 20:07:17 +0100 |
| commit | edae92c880cd095ce56a95c8a7b3204ab3602d64 (patch) | |
| tree | 50efa4d8b55d81c0490592754451657e8ada72dd /addons/mrp/static/src/js | |
| parent | f2a91f8cba0724ab53030dda6ee14897f5929d96 (diff) | |
[REF] mrp: adapt code after jQuery update
Part of task 1896658
Co-authored-by: Aaron Bohy <aab@odoo.com>
Co-authored-by: Christophe Matthieu <chm@odoo.com>
Co-authored-by: Mathieu Duckerts-Antoine <dam@odoo.com>
Co-authored-by: David Monjoie <dmo@odoo.com>
Co-authored-by: Martin Geubelle <mge@odoo.com>
Co-authored-by: svs-odoo <svs@odoo.com>
Co-authored-by: Vincent Schippefilt <vsc@odoo.com>
Diffstat (limited to 'addons/mrp/static/src/js')
| -rw-r--r-- | addons/mrp/static/src/js/mrp.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mrp/static/src/js/mrp.js b/addons/mrp/static/src/js/mrp.js index 154b65ce473..f9045ee2833 100644 --- a/addons/mrp/static/src/js/mrp.js +++ b/addons/mrp/static/src/js/mrp.js @@ -68,7 +68,7 @@ var TimeCounter = AbstractField.extend({ }); } }); - return $.when(this._super.apply(this, arguments), def); + return Promise.all([this._super.apply(this, arguments), def]); }, destroy: function () { |