summaryrefslogtreecommitdiff
path: root/addons/document/document_directory.py
diff options
context:
space:
mode:
authorVir (Open ERP) <vir@tinyerp.com>2010-06-02 13:53:32 +0530
committerVir (Open ERP) <vir@tinyerp.com>2010-06-02 13:53:32 +0530
commita00a181d98fdb43a9987e8117ef70eac2d09638a (patch)
treeffe3e986d4427b3132e268e2c83ba11fca27eb62 /addons/document/document_directory.py
parentd1cfcf4c5cf99b98883613418d076e606864e8b7 (diff)
parent8397cd973da9ae5033ad11a3c121f02e6aa7d653 (diff)
[Merge] Merge with trunk addons
bzr revid: vir@tinyerp.com-20100602082332-bq3vbck48iyd4thx
Diffstat (limited to 'addons/document/document_directory.py')
-rw-r--r--addons/document/document_directory.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 56e52aa9b69..e395f96833d 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -104,11 +104,9 @@ class document_directory(osv.osv):
]
def name_get(self, cr, uid, ids, context={}):
res = []
- all_ids = self.search(cr,uid,[])
+ if not self.search(cr,uid,[('id','in',ids)]):
+ ids = []
for d in self.browse(cr, uid, ids, context=context):
- if d.id not in all_ids:
- continue
-
s = ''
d2 = d
while d2 and d2.parent_id: