diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-09-14 16:18:06 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-09-14 16:18:06 +0200 |
| commit | f910cf4e722a7daa75488ab3701fedcd2d1c49b9 (patch) | |
| tree | 6beafa74cd5f33fa0c0a6b1e2c74c4636dc4b80d /addons/document/document_directory.py | |
| parent | 994441ae4a2af6d55248d431682ce64cd943e2a8 (diff) | |
| parent | 53bd6a6c582b1e162b1156832e353a74d672fb9c (diff) | |
[MERGE] Merged with addons/trunk, except access rules for mail_mail.
bzr revid: tde@openerp.com-20120914141806-lprl9h4eaa4d4bvk
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 |