Bhumika (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-thunderbird_plugins_5.0-atp into
lp:openobject-addons.
Requested reviews:
tfr (Openerp) (tfr)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-thunderbird_plugins_5.0-atp/+merge/75486
Hello,
Make Plugins compatible with thunderbird 5.0 and thunderbird 6.0 Beta.,
Fixed partner_id warning .correct the name of field
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-thunderbird_plugins_5.0-atp/+merge/75486
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-thunderbird_plugins_5.0-atp.
=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py 2011-09-13 13:23:40 +0000
+++ mail/mail_thread.py 2011-09-15 07:04:34 +0000
@@ -213,8 +213,9 @@
'res_id': thread.id,
}
to_attach.append(ir_attachment.create(cr, uid, data_attach, context=context))
-
- partner_id = hasattr(thread, 'partner_id') and (thread.partner_id and thread.partner_id.id or False) or False
+ partner_id = False
+ if thread._columns.get('partner_id') and thread.partner_id :
+ partner_id=thread.partner_id.id
if not partner_id and thread._name == 'res.partner':
partner_id = thread.id
data = {
=== modified file 'thunderbird/partner/partner.py'
--- thunderbird/partner/partner.py 2011-09-08 00:16:51 +0000
+++ thunderbird/partner/partner.py 2011-09-15 07:04:34 +0000
@@ -88,11 +88,11 @@
res['res_id'] = res_id
obj_attch.create(cr, uid, res)
threads = self.pool.get(model).browse(cr, uid, res_id)
-
+
thread_pool.message_append(cr, uid,
[threads],
subject = msg.get('subject'),
- details = msg.get('body_text'),
+ body_text = msg.get('body_text'),
email_to = msg.get('to'),
email_from = msg.get('from'),
email_cc = msg.get('cc'),
=== modified file 'thunderbird/plugin/openerp_plugin.xpi'
Binary files thunderbird/plugin/openerp_plugin.xpi 2011-06-16 10:25:18 +0000 and thunderbird/plugin/openerp_plugin.xpi 2011-09-15 07:04:34 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome.manifest'
--- thunderbird/plugin/openerp_plugin/chrome.manifest 2011-01-14 00:11:01 +0000
+++ thunderbird/plugin/openerp_plugin/chrome.manifest 2011-09-15 07:04:34 +0000
@@ -1,3 +1,7 @@
+interfaces components/xml-rpc.xpt
+component {4d7d15c0-3747-4f7f-b6b3-792a5ea1a9aa} components/nsXmlRpcClient.js
+contract @mozilla.org/xml-rpc/client;1 {4d7d15c0-3747-4f7f-b6b3-792a5ea1a9aa}
+category profile-after-change @mozilla.org/xml-rpc/client;1
content openerp_plugin jar:chrome/openerp_plugin.jar!/content/
overlay chrome://messenger/content/messenger.xul chrome://openerp_plugin/content/overlay.xul
locale openerp_plugin en-US jar:chrome/openerp_plugin.jar!/locale/en-US/
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar 2011-06-16 10:25:18 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar 2011-09-15 07:04:34 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js'
--- thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js 2011-06-16 10:18:52 +0000
+++ thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js 2011-09-15 07:04:34 +0000
@@ -563,7 +563,7 @@
//get the whole server path
function getServerUrl(){
- return getServer()+":"+getPort()+"/"+getServerService();
+ return getServer()+"/"+getServerService();
}
//get user id for the xmlrpc request
=== modified file 'thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js'
--- thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js 2011-01-14 00:11:01 +0000
+++ thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js 2011-09-15 07:04:34 +0000
@@ -46,6 +46,7 @@
/*
* Constants
*/
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
const XMLRPCCLIENT_CONTRACTID = '@mozilla.org/xml-rpc/client;1';
const XMLRPCCLIENT_CID =
Components.ID('{4d7d15c0-3747-4f7f-b6b3-792a5ea1a9aa}');
@@ -103,6 +104,10 @@
_serverUrl: null,
_useAuth: false,
+ classDescription: "nsXmlRpcClient XPCOM component",
+ classID: Components.ID("{4d7d15c0-3747-4f7f-b6b3-792a5ea1a9aa}"),
+ contractID: "@mozilla.org/xml-rpc/client;1",
+
init: function(serverURL) {
this._serverUrl = serverURL;
this._encoding = "UTF-8";
@@ -712,6 +717,12 @@
}
};
+if (XPCOMUtils.generateNSGetFactory)
+ var NSGetFactory = XPCOMUtils.generateNSGetFactory([nsXmlRpcClient]);
+else
+ var NSGetModule = XPCOMUtils.generateNSGetModule([nsXmlRpcClient]);
+
+
/* The XMLWriter class constructor */
function XMLWriter(encoding) {
if (!encoding)
@@ -896,7 +907,6 @@
/*
* Functions
*/
-
/* module initialisation */
function NSGetModule(comMgr, fileSpec) { return nsXmlRpcClientModule; }
=== modified file 'thunderbird/plugin/openerp_plugin/install.rdf'
--- thunderbird/plugin/openerp_plugin/install.rdf 2011-01-14 00:11:01 +0000
+++ thunderbird/plugin/openerp_plugin/install.rdf 2011-09-15 07:04:34 +0000
@@ -15,7 +15,7 @@
<Description>
<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
<em:minVersion>2.0</em:minVersion>
- <em:maxVersion>3.1.*</em:maxVersion>
+ <em:maxVersion>6.0.*</em:maxVersion>
</Description>
</em:targetApplication>
</Description>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
