diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-05 16:20:48 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-05 16:20:48 +0100 |
| commit | eefca5d492d6f35dd4b063a294b6b8a0a576e83e (patch) | |
| tree | 0776e0015aaca70d5d71986846391466a12516e4 /addons/base_import | |
| parent | 1ed7f219a59a2ff036bcaf72cb423b961a39802c (diff) | |
| parent | 73610ff99216ff31eedb6c0a587846ce9209e095 (diff) | |
[MERGE] forward port branch saas-11.1 up to 73610ff9921
Diffstat (limited to 'addons/base_import')
| -rw-r--r-- | addons/base_import/i18n/nl.po | 4 | ||||
| -rw-r--r-- | addons/base_import/static/src/js/import_action.js | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/base_import/i18n/nl.po b/addons/base_import/i18n/nl.po index 4fcfe1a5172..968bfbac4bb 100644 --- a/addons/base_import/i18n/nl.po +++ b/addons/base_import/i18n/nl.po @@ -4,7 +4,7 @@ # # Translators: # Yenthe Van Ginneken <yenthespam@gmail.com>, 2016 -# Martin Trigaux <mat@odoo.com>, 2016 +# Martin Trigaux, 2016 # Eric Geens <ericgeens@yahoo.com>, 2016 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016 # Cas Vissers <casvissers@brahoo.nl>, 2016 @@ -27,7 +27,7 @@ msgstr "" #: code:addons/base_import/static/src/js/import_action.js:155 #, python-format msgid " Import Template for Customers" -msgstr "" +msgstr "Importeer sjabloon voor klanten" #. module: base_import #. openerp-web diff --git a/addons/base_import/static/src/js/import_action.js b/addons/base_import/static/src/js/import_action.js index 513a663cfc2..11b81a6373a 100644 --- a/addons/base_import/static/src/js/import_action.js +++ b/addons/base_import/static/src/js/import_action.js @@ -137,6 +137,7 @@ var DataImport = Widget.extend(ControlPanelMixin, { model: 'base_import.import', method: 'create', args: [{res_model: this.res_model}], + kwargs: {context: session.user_context}, }); }, renderButtons: function() { @@ -286,6 +287,7 @@ var DataImport = Widget.extend(ControlPanelMixin, { model: 'base_import.import', method: 'parse_preview', args: [this.id, this.import_options()], + kwargs: {context: session.user_context}, }).done(function (result) { var signal = result.error ? 'preview_failed' : 'preview_succeeded'; self[signal](result); |