diff options
| author | Harry (Open ERP) <hmo@tinyerp.com> | 2010-03-16 12:01:37 +0530 |
|---|---|---|
| committer | Harry (Open ERP) <hmo@tinyerp.com> | 2010-03-16 12:01:37 +0530 |
| commit | 4b08bc496fe4945b25580d004b7f8745d00f7b15 (patch) | |
| tree | 95db67d8a4166a81a4f7a3d486ab544930c3a96e /addons/document/document_directory.py | |
| parent | 6bce9446b2dfb4bab41a84cb09960e6bca7e8dd1 (diff) | |
| parent | c983859b9d5002f8242dfe4d759712ba51d466a7 (diff) | |
[MERGE] merge from lp:~openerp/openobject-addons/trunk/
bzr revid: hmo@tinyerp.com-20100315064056-wf12b99uz3700nyi
bzr revid: hmo@tinyerp.com-20100316063137-siiqwyr7q62mu5xs
Diffstat (limited to 'addons/document/document_directory.py')
| -rw-r--r-- | addons/document/document_directory.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index bcb86d589d2..17c3dfb66d9 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -65,14 +65,14 @@ class document_directory(osv.osv): objid=self.pool.get('ir.model.data') try: mid = objid._get_id(cr, uid, 'document', 'dir_root') - return None # TODO: check why not display root dir + return False # TODO: check why not display root dir 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): |