diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2012-09-17 18:35:06 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2012-09-17 18:35:06 +0530 |
| commit | 765879d17c8ecfec8b2fe1467609495c8215edc2 (patch) | |
| tree | 678ab828473c2950a6f29cbfba36fabb4c2c88fe /addons/document | |
| parent | 840a0c9590db742089398cd74c13cc6d8d41675e (diff) | |
| parent | 84094e0c39bf20499aefccc6c78143aeb2227d18 (diff) | |
[MERGE]
bzr revid: hmo@tinyerp.com-20120917130506-yplwv5v9z4j9m7kg
Diffstat (limited to 'addons/document')
| -rw-r--r-- | addons/document/document_directory.py | 6 | ||||
| -rw-r--r-- | addons/document/report/document_report_view.xml | 2 |
2 files changed, 3 insertions, 5 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 diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index 2a8b9f34ddf..2740967d53a 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -114,7 +114,7 @@ <field name="model">report.document.user</field> <field name="arch" type="xml"> <graph string="Files by User" type="pie"> - <field name="user" /> + <field name="user_id" /> <field name="nbr" operator="+"/> </graph> </field> |