diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-15 13:10:45 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-15 13:10:45 +0200 |
| commit | 9fe4cf5f728ffc3ad2bb387841aa1b57c1ba16dd (patch) | |
| tree | 8dc9257aba7132a65fa9ac02fd847db290d95d30 /addons/web/static/src | |
| parent | b2220945896bb9f343840d19b8d2821467e22d48 (diff) | |
| parent | dda0d3d62d23cae3013db32bcb6322a2574f0162 (diff) | |
[MERGE] forward port of branch saas-11 up to dda0d3d
# Conflicts:
# addons/product_uos/i18n/lo.po
# addons/sales_team/models/__init__.py
# addons/website_payment/views/website_payment_templates.xml
# addons/website_portal_sale/views/templates.xml
# openerp/addons/base/ir/ir_qweb.py
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/action_manager.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/list_view_editable.js | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/addons/web/static/src/js/action_manager.js b/addons/web/static/src/js/action_manager.js index c7f79070e8c..8d33f1ab4ac 100644 --- a/addons/web/static/src/js/action_manager.js +++ b/addons/web/static/src/js/action_manager.js @@ -691,6 +691,9 @@ var ActionManager = Widget.extend({ // underlying form view (see comments above) pre_dialog.on_close(); } + if (!pre_dialog) { + self.dialog = null; + } }; this.dialog.on("closed", null, this.dialog.on_close); this.dialog_widget = executor.widget(); diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js index 3dde29e25a2..91f15de1a04 100644 --- a/addons/web/static/src/js/views/list_view_editable.js +++ b/addons/web/static/src/js/views/list_view_editable.js @@ -634,7 +634,10 @@ ListView.include(/** @lends instance.web.ListView# */{ if (saveInfo.created) { return self.start_edition(); } - var record = self.records[next_record](saveInfo.record, {wraparound: true}); + var record = self.records[next_record](saveInfo.record); + if (record === undefined) { + return self.start_edition(); + } return self.start_edition(record, options); }); }, |