diff options
| author | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2013-06-07 18:48:09 +0530 |
|---|---|---|
| committer | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2013-06-07 18:48:09 +0530 |
| commit | 66293ed61a7cbad4d6a1d47f79c6f45deace155c (patch) | |
| tree | b05fe35d29232a1ea357614a907fa56e75c056ea /addons/google_docs/google_docs.py | |
| parent | ff64d5a524612b9c9bb5d839e5c7e0834bcbdc88 (diff) | |
| parent | 8c6ff33bef12cdfed35b15a90c3fd13bdd723b42 (diff) | |
[MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20130607131809-iw2q151jg8kvbw2m
Diffstat (limited to 'addons/google_docs/google_docs.py')
| -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() |