diff options
| author | DJ Patel <mdi@tinyerp.com> | 2014-04-17 12:15:01 +0530 |
|---|---|---|
| committer | DJ Patel <mdi@tinyerp.com> | 2014-04-17 12:15:01 +0530 |
| commit | 483fe85c2b3e659bfdb3d2e483e8bbaab3fcf4e4 (patch) | |
| tree | a7e46439e5cf609578130abe6a6d9c041734841d /addons/base_import/static/src | |
| parent | 7d5b66c526fc2137d1f65cb881ebe2409e2b2234 (diff) | |
| parent | dd47f684f0d0d5f8844d8893d3bbc9eee2a48c46 (diff) | |
[Merge] Merged with main branch.
bzr revid: mdi@tinyerp.com-20140417064501-cf2rp86sukob7v1a
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"> |