diff options
| author | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
|---|---|---|
| committer | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
| commit | d979aad3de95ae24aa1db52cf17c4eecf3d3ce6b (patch) | |
| tree | 592698c8e0dab53fcd157dd456a800bd4a80b5bf /addons/document/document.py | |
| parent | eea80125f7d1c739260929fb1f38866ef21439e1 (diff) | |
| parent | d101d3fbaaffe2d0219ac6cfeef50338a2501664 (diff) | |
[MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4
Diffstat (limited to 'addons/document/document.py')
| -rw-r--r-- | addons/document/document.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/document/document.py b/addons/document/document.py index 90f57438ce8..ef9ca01bd1e 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -117,7 +117,7 @@ class document_file(osv.osv): # If ir.attachment contained any data before document is installed, preserve # the data, don't drop the column! 'db_datas': fields.binary('Data', oldname='datas'), - 'datas': fields.function(_data_get, method=True, fnct_inv=_data_set, string='File Content', type="binary", nodrop=True), + 'datas': fields.function(_data_get, fnct_inv=_data_set, string='File Content', type="binary", nodrop=True), # Fields of document: 'user_id': fields.many2one('res.users', 'Owner', select=1), @@ -252,7 +252,7 @@ class document_file(osv.osv): ids = ids2 if 'file_size' in vals: # only write that field using direct SQL calls del vals['file_size'] - if len(ids) and len(vals): + if ids and vals: result = super(document_file,self).write(cr, uid, ids, vals, context=context) cr.commit() # ? return result |