[MERGE] from lp:~openerp/openobject-addons/trunk/

bzr revid: hmo@tinyerp.com-20100317060145-grxjqr8b90u4nn5d
2010-03-17 11:31:45 +05:30
parent 0db347d65f b6b93ef9d0
commit 586a4ef79a
22 changed files with 423 additions and 416 deletions
@@ -215,8 +215,8 @@ class document_directory(osv.osv):
            path.append(duri[0])
            duri = duri[1:]
            did = nid[0]
-        
-        return (nodes.node_dir(path, nparent,ncontext,self.browse(cr,uid,did, context)), duri)
+        root_node = did and self.browse(cr,uid,did, context) or False
+        return (nodes.node_dir(path, nparent,ncontext, root_node), duri)

        
        nid = self.search(cr,uid,[('parent_id','=',did),('name','=',duri[0]),('type','=','ressource')], context=context)