diff --git a/addons/document/document.py b/addons/document/document.py index 3450d3a51a4..21aa59661a7 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -695,8 +695,9 @@ class document_file(osv.osv): import urllib datas=base64.encodestring(urllib.urlopen(vals['link']).read()) else: - datas=vals.get('datas',False) - vals['file_size']= len(datas) + datas = vals.get('datas',False) + + vals['file_size']= datas and len(datas) or 0 if not self._check_duplication(cr,uid,vals): raise except_orm(_('ValidateError'), _('File name must be unique!')) result = super(document_file,self).create(cr, uid, vals, context) diff --git a/addons/report_document/report_document.py b/addons/report_document/report_document.py index b2cb912ff77..9f8fea2e972 100644 --- a/addons/report_document/report_document.py +++ b/addons/report_document/report_document.py @@ -101,7 +101,8 @@ class report_files_partner(osv.osv): p.name as partner from ir_attachment f inner join res_partner p - on (f.partner_id=p.id) + on (f.partner_id=p.id) + where f.datas_fname is not null group by p.name ) """) diff --git a/addons/report_document/report_document_view.xml b/addons/report_document/report_document_view.xml index 8f68875ea40..746bf6d89c4 100644 --- a/addons/report_document/report_document_view.xml +++ b/addons/report_document/report_document_view.xml @@ -275,7 +275,7 @@ - Files Per Month + Files Per Partner report.files.partner form