diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-04-07 18:33:18 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-04-07 18:33:18 +0200 |
| commit | 0fad8159f3e77336e34de017a4ca5f28d7a7fe02 (patch) | |
| tree | 2bf89418078c923826a535c69395fa92bba8e16b /addons/base_import/static/src | |
| parent | f1d3f2a0c42f1de5970b5f897c4e5b279d1ee23b (diff) | |
| parent | ffae3807255269ff290bdf9fe62bc668feaade75 (diff) | |
[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
Diffstat (limited to 'addons/base_import/static/src')
| -rw-r--r-- | addons/base_import/static/src/js/import.js | 2 | ||||
| -rw-r--r-- | addons/base_import/static/src/xml/import.xml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js index 1238bc9570f..78cb09001a9 100644 --- a/addons/base_import/static/src/js/import.js +++ b/addons/base_import/static/src/js/import.js @@ -285,7 +285,7 @@ openerp.base_import = function (instance) { callback(item_finder(default_value)); }, - + placeholder: _t('Don\'t import'), width: 'resolve', dropdownCssClass: 'oe_import_selector' }); diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml index 97bf3e66f7a..8d7155912e6 100644 --- a/addons/base_import/static/src/xml/import.xml +++ b/addons/base_import/static/src/xml/import.xml @@ -347,8 +347,7 @@ <tr class="oe_import_fields"> <!-- Iterate on first row to ensure we have all columns --> <td t-foreach="preview[0]" t-as="column"> - <input placeholder="Don't Import" - class="oe_import_match_field"/> + <input class="oe_import_match_field"/> </td> </tr> <tr t-foreach="preview" t-as="row" class="oe_import_grid-row"> |