pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 8.0 up to 9874892

Browse Source
This commit is contained in:
Christophe Simonis
2016-09-15 10:49:55 +02:00
parent a5dfe2f0d4 9874892b97
commit 2fa3591a9b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/view_list.js
+2 -2
View File
@@ -1124,8 +1124,8 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
_(names).pluck(1).join(', ')); _(names).pluck(1).join(', '));
record.set(column.id, ids); record.set(column.id, ids);
}); });
// temp empty value // temporary empty display name
record.set(column.id, false); record.set(column.id + '__display', false);
} }
} }
return column.format(record.toForm().data, { return column.format(record.toForm().data, {
openerp/modules/module.py
+1 -1
View File
@@ -121,7 +121,7 @@ def get_module_path(module, downloaded=False, display_warning=True):
""" """
initialize_sys_path() initialize_sys_path()
for adp in ad_paths: 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) return opj(adp, module)
if downloaded: if downloaded: