From 826e2b8fdbb267efab4feff67e373e0e0c1c1568 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)"
Date: Fri, 28 Sep 2012 11:03:38 +0530
Subject: [FIX]Google_docs: added Resource lib for latest gadta.docs and
improve raise msg
bzr revid: mma@tinyerp.com-20120928053338-oqzeawxblt7l6nt4
---
addons/google_docs/google_docs.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'addons/google_docs')
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index f1477f9c7f2..f1e8dff0d45 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -26,8 +26,9 @@ try:
from gdata.client import RequestError
from gdata.docs.service import DOCUMENT_LABEL
import gdata.auth
+ from gdata.docs.data import Resource
except ImportError:
- raise osv.except_osv(_('Google Docs Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list.'))
+ raise osv.except_osv(_('Google Docs Error!'), _('Please install latest gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list.'))
class google_docs_ir_attachment(osv.osv):
_inherit = 'ir.attachment'
--
cgit v1.2.3
From 3eb5cfb61b6bbb84043f4fa6b3fdefb0fbb320c7 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)"
Date: Wed, 3 Oct 2012 16:52:27 +0530
Subject: [IMP]remove call_backs from call method.
bzr revid: vme@tinyerp.com-20121003112227-vu2crilmvnk2me8j
---
addons/google_docs/static/src/js/gdocs.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'addons/google_docs')
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index bcfd24f8c0d..2aafdd3de4b 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -22,7 +22,7 @@ var _t = instance.web._t;
var form = self.getParent();
form.sidebar_context().then(function (context) {
var ds = new instance.web.DataSet(this, 'ir.attachment', context);
- ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context], function(r) {
+ ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context]).then(function(r) {
if (r == 'False') {
var params = {
error: response,
@@ -35,7 +35,7 @@ var _t = instance.web._t;
}
form.reload();
});
- })
+ });
}
- })
-}
+ });
+};
--
cgit v1.2.3
From ca6f593527e9246c54964becd0bce6a65f16d781 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Thu, 11 Oct 2012 00:04:24 +0200
Subject: [IMP]
bzr revid: fp@openerp.com-20121010220424-21gc23fsjcwi85iv
---
addons/google_docs/__openerp__.py | 1 -
1 file changed, 1 deletion(-)
(limited to 'addons/google_docs')
diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index b02f2e912fc..8b9a4123aa9 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -27,7 +27,6 @@
'category': 'Tools',
'installable': True,
'auto_install': False,
- 'web': True,
'js': ['static/src/js/gdocs.js'],
'data': [
'security/ir.model.access.csv',
--
cgit v1.2.3
From b6cdf7cbbdaf08a427cbb3b89dc29127aca4e5ec Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Thu, 11 Oct 2012 10:29:13 +0200
Subject: fix
bzr revid: fp@tinyerp.com-20121011082913-82wifnn46sqg57ko
---
addons/google_docs/res_config_user_view.xml | 1 +
1 file changed, 1 insertion(+)
(limited to 'addons/google_docs')
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 766fbb90b43..9ac5bec9e98 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -30,6 +30,7 @@ This is the id of the template document, on google side. You can find it thanks
for a spreadsheet document with url like `https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, the ID is `spreadsheet:123456789`
for a presentation (slide show) document with url like `https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id.p`, the ID is `presentation:123456789`
for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789`
+
--
cgit v1.2.3
From 666f634b85e6446944f803512644a3251802462f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers
Date: Thu, 11 Oct 2012 11:19:50 +0200
Subject: [FIX] google docs
bzr revid: fp@tinyerp.com-20121011091950-yt0p6b8dcsrvlkfv
---
addons/google_docs/res_config_user_view.xml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'addons/google_docs')
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 9ac5bec9e98..e6c4223735f 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -8,9 +8,10 @@
google_docs.config.tree
google.docs.config
-
+
-
+
+
@@ -18,6 +19,7 @@
google_docs.config.form
google.docs.config
+
--
cgit v1.2.3