Merge with trunk

bzr revid: rgaopenerp-20121109052743-v8ts1k78k37dfgpx

1 files changed, 2 insertions, 2 deletions

diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 0cc93b2510c..45e1d09d42c 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -16,9 +16,9 @@ var _t = instance.web._t,
             var view = self.getParent();
             var ids = ( view.fields_view.type != "form" )? view.groups.get_selection().ids : [ view.datarecord.id ];
             if( !_.isEmpty(ids) ){
-                view.sidebar_context().then(function (context) {
+                view.sidebar_context().done(function (context) {
                     var ds = new instance.web.DataSet(this, 'ir.attachment', context);
-                    ds.call('google_doc_get', [view.dataset.model, ids, context]).then(function(r) {
+                    ds.call('google_doc_get', [view.dataset.model, ids, context]).done(function(r) {
                         if (r == 'False') {
                             var params = {
                                 error: response,