[MERGE] forward port of branch saas-1 up to revid 4918 chs@openerp.com-20131114134731...

bzr revid: chs@openerp.com-20131114135502-xqi6df3jzm7ng0io

diff --cc openerp/osv/orm.py
Simple merge

diff --cc openerpcommand/common.py
index f306d7f,443f749..9209f8e
--- 1/openerpcommand/common.py
--- 2/openerpcommand/common.py
+++ b/openerpcommand/common.py
@@@ -40,10 -40,7 +40,9 @@@ def get_addons_from_paths(paths, exclud
      module_names = []
      for p in paths:
          if os.path.exists(p):
-             names = list(set(os.listdir(p)))
-             names = filter(lambda a: not (a.startswith('.') or a in exclude), names)
+             names = [n for n in os.listdir(p) if os.path.isfile(os.path.join(p, n, '__openerp__.py')) and not n.startswith('.') and n not in exclude]
 +            names = filter(lambda a: os.path.isdir(os.path.join(p, a)), names)
 +            names = filter(lambda a: os.path.exists(os.path.join(p, a, '__openerp__.py')), names)
              module_names.extend(names)
          else:
              print "The addons path `%s` doesn't exist." % p