[FIX] sale: Removed duplicate field from the list view.

[odoo/odoo.git] / addons / document / document_directory.py

diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 2623c1f..554eae4 100644 (file)
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -32,6 +32,7 @@ from tools.translate import _
 class document_directory(osv.osv):
     _name = 'document.directory'
     _description = 'Document directory'
+    _order = 'name desc'
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
         'write_date': fields.datetime('Date Modified', readonly=True),
@@ -63,14 +64,14 @@ class document_directory(osv.osv):
     def _get_root_directory(self, cr,uid, context=None):
         objid=self.pool.get('ir.model.data')
         try:
-            mid = objid._get_id(cr, uid, 'document', 'dir_root')
+            mid = objid._get_id(cr, uid, 'document', 'dir_root')            
             if not mid:
-                return None
+                return False
         except Exception, e:
             import netsvc
             logger = netsvc.Logger()
             logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set directory root:'+ str(e))
-            return None
+            return False
         return objid.browse(cr, uid, mid, context=context).res_id
 
     def _get_def_storage(self,cr,uid,context=None):
@@ -98,6 +99,16 @@ class document_directory(osv.osv):
         ('dirname_uniq', 'unique (name,parent_id,ressource_id,ressource_parent_type_id)', 'The directory name must be unique !'),
         ('no_selfparent', 'check(parent_id <> id)', 'Directory cannot be parent of itself!')
     ]
+    def name_get(self, cr, uid, ids, context={}):
+        res = []
+        for d in self.browse(cr, uid, ids, context=context):
+            s = ''
+            d2 = d
+            while d2 and d2.parent_id:
+                s = d2.name + (s and ('/' + s) or '')
+                d2 = d2.parent_id
+            res.append((d.id, s))
+        return res
 
     def ol_get_resource_path(self,cr,uid,dir_id,res_model,res_id):
         # this method will be used in process module
@@ -187,8 +198,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)