diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2011-07-06 12:26:36 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2011-07-06 12:26:36 +0530 |
| commit | 0d2f870ee53c2299dc9de262a0f0c78d42e19bee (patch) | |
| tree | 58456f843414fb5fea8a005445ddf8ffaddbe8c2 /addons/document | |
| parent | ca6a1a7e61a0ff8de0d7f509439db781e9847a8b (diff) | |
| parent | 4a2f59cca8ee4ffd15394699e2576d979a604ed5 (diff) | |
[MERGE] Merge from main branch
bzr revid: mra@mra-laptop-20110706065636-zt4s6w7i5gtv3r9m
Diffstat (limited to 'addons/document')
| -rw-r--r-- | addons/document/directory_report.py | 2 | ||||
| -rw-r--r-- | addons/document/document.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/document/directory_report.py b/addons/document/directory_report.py index 1665a7abf68..2726fcd5462 100644 --- a/addons/document/directory_report.py +++ b/addons/document/directory_report.py @@ -56,7 +56,7 @@ class ir_action_report_xml(osv.osv): return [('id','in',report_id)] _columns={ - 'model_id' : fields.function(_model_get, fnct_search=_model_search, method=True, string='Model Id'), + 'model_id' : fields.function(_model_get, fnct_search=_model_search, string='Model Id'), } ir_action_report_xml() diff --git a/addons/document/document.py b/addons/document/document.py index 90f57438ce8..69e123b87eb 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), |