diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-01-03 14:05:48 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-01-03 14:05:48 +0100 |
| commit | 55b810dc70cccb23144986d54fd28bb5f91f2b1b (patch) | |
| tree | a83dda56dac7f02be26f6821dea5b2f1926ea7b0 /addons/base_import/static/src | |
| parent | 8bc7cebd9c19ae8f77378d115a8401d7b7de56b0 (diff) | |
| parent | 726b91b9fbc994c6b2f2cb45e36d4c224497f11b (diff) | |
[MERGE] forward port branch saas-11.1 up to 726b91b9fbc
Diffstat (limited to 'addons/base_import/static/src')
| -rw-r--r-- | addons/base_import/static/src/js/import_action.js | 5 | ||||
| -rw-r--r-- | addons/base_import/static/src/xml/base_import.xml | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/addons/base_import/static/src/js/import_action.js b/addons/base_import/static/src/js/import_action.js index a0558e36053..ee9e95fa5a0 100644 --- a/addons/base_import/static/src/js/import_action.js +++ b/addons/base_import/static/src/js/import_action.js @@ -323,6 +323,7 @@ var DataImport = Widget.extend(ControlPanelMixin, { this.$('.oe_import_float_decimal_separator').val(result.options.float_decimal_separator).change(); if (result.debug === false){ this.$('.oe_import_tracking').hide(); + this.$('.oe_import_deferparentstore').hide(); } var $fields = this.$('.oe_import_fields input'); @@ -461,10 +462,12 @@ var DataImport = Widget.extend(ControlPanelMixin, { return $(el).select2('val') || false; }).get(); var tracking_disable = 'tracking_disable' in kwargs ? kwargs.tracking_disable : !this.$('#oe_import_tracking').prop('checked') + var defer_parent_store = 'defer_parent_store' in kwargs ? kwargs.defer_parent_store : !!this.$('#oe_import_deferparentstore').prop('checked') delete kwargs.tracking_disable; + delete kwargs.defer_parent_store; kwargs.context = _.extend( {}, this.parent_context, - {tracking_disable: tracking_disable} + {tracking_disable: tracking_disable, defer_parent_store_computation: defer_parent_store} ); return this._rpc({ model: 'base_import.import', diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml index 2cfec6eee49..4130b1d0347 100644 --- a/addons/base_import/static/src/xml/base_import.xml +++ b/addons/base_import/static/src/xml/base_import.xml @@ -8,7 +8,7 @@ <input type="hidden" name="import_id"/> <div class="oe_import_box col-sm-9"> <div class="col-sm-12"> - <p>Select a CSV or Excel file to import. <a href="https://www.odoo.com/documentation/user/10.0/general/base_import/import_faq.html" target="new" class="pull-right">Help</a></p> + <p>Select a CSV or Excel file to import. <a href="https://www.odoo.com/documentation/user/11.0/general/base_import/import_faq.html" target="new" class="pull-right">Help</a></p> </div> <div class="col-sm-10"> <div class="input-group"> @@ -68,6 +68,15 @@ Track history during import </label> </div> + <div title="If the model uses parent/child relations, computing the + parent / child relation occurs on every line, and lead to a slower import. + Defering it can speed up import." + class="oe_import_deferparentstore"> + <input type="checkbox" id="oe_import_deferparentstore" checked="checked"/> + <label for="oe_import_deferparentstore"> + Defer parent/child computation + </label> + </div> <input type="checkbox" class="oe_import_has_header" id="oe_import_has_header" checked="checked"/> <label for="oe_import_has_header">The first row |