diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-05-12 16:39:45 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-05-12 16:39:45 +0200 |
| commit | 46235aa78c04240f7abcf0e62ff92aad997700a2 (patch) | |
| tree | 25d0fe6a3eac3d822f56b63878ff9552406fafd9 /addons/base_import | |
| parent | cce820565d9b85786d528b17670031bb112f1e64 (diff) | |
| parent | 9d9cfd585f56bf64126e7316ea60ea5131a02059 (diff) | |
[MERGE] Sync with turnk
Diffstat (limited to 'addons/base_import')
| -rw-r--r-- | addons/base_import/static/src/js/import.js | 5 | ||||
| -rw-r--r-- | addons/base_import/static/src/xml/import.xml | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js index 78cb09001a9..0ee88e0a203 100644 --- a/addons/base_import/static/src/js/import.js +++ b/addons/base_import/static/src/js/import.js @@ -363,7 +363,10 @@ openerp.base_import = function (instance) { var fields = this.$('.oe_import_fields input.oe_import_match_field').map(function (index, el) { return $(el).select2('val') || false; }).get(); - kwargs.context = this.parent_context; + kwargs.context = _.extend( + {}, this.parent_context, + {tracking_disable: !this.$('#oe_import_tracking').prop('checked')} + ); return this.Import.call('do', [this.id, fields, this.import_options()], kwargs) .then(undefined, function (error, event) { // In case of unexpected exception, convert diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml index 8d7155912e6..953beca8d9f 100644 --- a/addons/base_import/static/src/xml/import.xml +++ b/addons/base_import/static/src/xml/import.xml @@ -53,6 +53,15 @@ <div class="oe_import_with_file oe_padding"> <h2>Map your data to OpenERP</h2> + <div title="If the model uses openchatter, history tracking + will set up subscriptions and send notifications + during the import, but lead to a slower import."> + <input type="checkbox" id="oe_import_tracking" + checked="checked"/> + <label for="oe_import_tracking"> + Track history during import + </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 of the |