diff options
| author | Raphael Collet <rco@openerp.com> | 2012-09-14 16:37:49 +0200 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-09-14 16:37:49 +0200 |
| commit | 95d5ff7332344ce5d263acede7ede714b2a7eb9d (patch) | |
| tree | 178dce291b67af6f8c0bdf9e86039c59fbdcdb66 /addons/document/document_directory.py | |
| parent | 5720ae3a90d11428c610c0c040f37315ce433488 (diff) | |
| parent | 53bd6a6c582b1e162b1156832e353a74d672fb9c (diff) | |
[MERGE] from trunk
bzr revid: rco@openerp.com-20120914143749-jq9mxap7tpyvuyce
Diffstat (limited to 'addons/document/document_directory.py')
| -rw-r--r-- | addons/document/document_directory.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index 0f18673a007..1ead23ab402 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -69,7 +69,7 @@ class document_directory(osv.osv): } - def _get_root_directory(self, cr,uid, context=None): + 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') @@ -77,9 +77,7 @@ class document_directory(osv.osv): return False root_id = objid.read(cr, uid, mid, ['res_id'])['res_id'] return root_id - except Exception, e: - - _logger.warning('Cannot set directory root:'+ str(e)) + except Exception: return False return objid.browse(cr, uid, mid, context=context).res_id |