diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-15 11:02:44 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-15 11:02:44 +0200 |
| commit | 5adca2bc4665f82fb244f08453886181cceedef5 (patch) | |
| tree | 32766cf843c6aa657547656cc13875d2853b684c | |
| parent | 07a207c07c8252bccb0216b0716a2fd4f975f77d (diff) | |
| parent | 2fa3591a9bab94bf388c76346ad508261d1e6432 (diff) | |
[MERGE] forward port branch saas-6 up to 2fa3591
| -rw-r--r-- | addons/web/static/src/js/views/list_view.js | 4 | ||||
| -rw-r--r-- | openerp/modules/module.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js index 229ecb86d83..615db42e6b8 100644 --- a/addons/web/static/src/js/views/list_view.js +++ b/addons/web/static/src/js/views/list_view.js @@ -1183,8 +1183,8 @@ ListView.List = Class.extend( /** @lends instance.web.ListView.List# */{ _(names).pluck(1).join(', ')); record.set(column.id, ids); }); - // temp empty value - record.set(column.id, false); + // temporary empty display name + record.set(column.id + '__display', false); } } return column.format(record.toForm().data, { diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 1ea82fa3906..2d415542c9f 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -102,7 +102,7 @@ def get_module_path(module, downloaded=False, display_warning=True): """ initialize_sys_path() for adp in ad_paths: - if os.path.exists(opj(adp, module)) or os.path.exists(opj(adp, '%s.zip' % module)): + if os.path.exists(opj(adp, module, MANIFEST)) or os.path.exists(opj(adp, '%s.zip' % module)): return opj(adp, module) if downloaded: |