[MERGE] forward port branch saas-6 up to 2fa3591

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, {

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: