diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-05-03 16:00:29 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-05-03 16:00:29 +0200 |
| commit | a26c8d76b950d6bed6220bd85a922c79ee1098d3 (patch) | |
| tree | 44d22327893520c5201aebd9ef00063939eab53f /addons/google_docs | |
| parent | f8dad517525da1913d6266e45b93d33a455aa426 (diff) | |
| parent | 26e33ea7dc209a43355c12fbee3a845b481cbf05 (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20130503140029-vv7u9gjmax73qyta
Diffstat (limited to 'addons/google_docs')
| -rw-r--r-- | addons/google_docs/google_docs.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py index cdb14de1de3..2fd1976ae3b 100644 --- a/addons/google_docs/google_docs.py +++ b/addons/google_docs/google_docs.py @@ -155,7 +155,7 @@ class google_docs_ir_attachment(osv.osv): pool_ir_attachment = self.pool.get('ir.attachment') pool_gdoc_config = self.pool.get('google.docs.config') name_gdocs = '' - model_fields_dic = self.pool.get(res_model).read(cr, uid, res_id, [], context=context) + model_fields_dic = self.pool[res_model].read(cr, uid, res_id, [], context=context) # check if a model is configured with a template google_docs_config = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model)], context=context) @@ -191,4 +191,3 @@ This is the id of the template document, on google side. You can find it thanks _defaults = { 'name_template': 'gdoc_%(name)s', } -config() |