diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi index 6c9a53d83e8..36b457742c2 100644 Binary files a/addons/thunderbird/plugin/openerp_plugin.xpi and b/addons/thunderbird/plugin/openerp_plugin.xpi differ diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar index 717ad88d02f..84159937e2f 100644 Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js index 1c0bebcea64..13abf06e4ec 100755 --- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js +++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js @@ -200,7 +200,7 @@ var openPartnerHandler = { if (parseInt(partner_id) > 0){ var t = urlport + "/openerp/form/view?model=res.partner&id="+partner_id; - alert(t); + alert(t + ":" + " " + "you can copy the link and paste in weburl"); window.open(t); } @@ -296,73 +296,18 @@ function open_partner() searchPartner(senderemail); } -function open_partner() -{ - if (check() == false){ - return true - } - var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService); - var version_obj = prefService.getBranch("extensions."); - version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2); - version = version_obj.getCharPref("lastAppVersion"); - version = parseInt(version[0]) - - file = getPredefinedFolder(2); - - if (version > 2) - { - var emlsArray = gFolderDisplay.selectedMessages; - } - else - { - var emlsArray = GetSelectedMessages(); - } - - IETtotal = emlsArray.length; - IETexported = 0; - var msguri = emlsArray[0]; - - - //gives the selected email uri - var messageUri= gDBView.URIForFirstSelectedMessage; - - var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger); - - //gives the selected email object - var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri); - - //functionality to split the author name and email - if(message.author.charAt(0) == '"'){ - sendername = message.author.split('"')[1].split('"')[0]; - } - else if(message.author.indexOf('<')!=-1){ - sendername = message.author.split('<')[0]; - } - else{ - sendername = message.author; - } - if(message.author.indexOf('<')!=-1){ - senderemail = message.author.split('<')[1].split('>')[0]; - } - else{ - senderemail = message.author - } - searchPartner(senderemail); -} - var listDocumentHandler = { - onResult: function(client, context, result) { + onResult: function(client, context, result) { netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess'); var res = result.QueryInterface(Components.interfaces.nsISupportsArray); res_id = res.QueryElementAt(1, Components.interfaces.nsISupportsPRInt32); model = res.QueryElementAt(0, Components.interfaces.nsISupportsCString); - weburl = getWebServerURL(); webport = getwebPort(); var urlport = weburl+':'+webport; var t = urlport + "/openerp/form/view?model=" + model +"&id=" + res_id; - alert(t); + alert(t + ":" + " " + "you can copy the link and paste in weburl"); window.open(t); }, @@ -492,6 +437,64 @@ function open_contact() searchContact(); } +function search_document() +{ + if (check() == false){ + return true + } + + var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService); + var version_obj = prefService.getBranch("extensions."); + version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2); + version = version_obj.getCharPref("lastAppVersion"); + version = parseInt(version[0]) + + file = getPredefinedFolder(2); + + if (version > 2) + { + var emlsArray = gFolderDisplay.selectedMessages; + } + else + { + var emlsArray = GetSelectedMessages(); + } + + IETtotal = emlsArray.length; + IETexported = 0; + var msguri = emlsArray[0]; + + + //gives the selected email uri + var messageUri= gDBView.URIForFirstSelectedMessage; + + var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger); + + //gives the selected email object + var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri); + + //functionality to split the author name and email + if(message.author.charAt(0) == '"'){ + sendername = message.author.split('"')[1].split('"')[0]; + } + else if(message.author.indexOf('<')!=-1){ + sendername = message.author.split('<')[0]; + } + else{ + sendername = message.author; + } + if(message.author.indexOf('<')!=-1){ + senderemail = message.author.split('<')[1].split('>')[0]; + } + else{ + senderemail = message.author + } + + //set the initial information for the selected email + setSenderEmail(senderemail); + setSenderName(sendername); + searchdocument(); +} //function to open the configuration window var Config = { diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul index b2e66068bfd..230ab391ff1 100755 --- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul +++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul @@ -55,7 +55,7 @@ class="toolbarbutton-1" image="&imagearchive.value;" label= "Open Document" - oncommand="open_document();" /> + oncommand="search_document();" /> diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js index 7f7479b3839..39bfa076547 100755 --- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js +++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js @@ -966,6 +966,41 @@ function module_install() xmlRpcClient.asyncCall(listinstallmodulehandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod, strvalue],6); } +var listSearchwebdocumentHandler = { + onResult: function(client, context, result) { + netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess'); + var sendername = getSenderEmail(); + var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray); + var count = arrIdList.Count(); + for (i = 0; i < count; i++) { + var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray); + var strlSearchResult = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString); + var strlSearchResultValue = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString); + } + if(strlSearchResult=="email" && strlSearchResultValue!=''){ + setSenderEmail(strlSearchResultValue); + var t = getSenderEmail(); + open_document();} + + if(strlSearchResult=="email" && strlSearchResultValue==''){ + alert("Contact is not available."); + } + + if(strlSearchResult=="res_id"){ + setResourceId(strlSearchResultValue); + var t = getResourceId();} + }, + onFault: function (client, ctxt, fault) { + + }, + + onError: function (client, ctxt, status, errorMsg) { + + } + +} + + var listSearchContactHandler = { onResult: function(client, context, result) { @@ -1036,6 +1071,7 @@ var listSearchContactHandler = { } } + var listSearchContactdetailHandler = { onResult: function(client, context, result) { netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess'); @@ -1276,6 +1312,31 @@ function searchCheckbox() xmlRpcClient.asyncCall(listSearchCheckboxHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,arrofarr ],6); } +function searchdocument() +{ + var branchobj = getPref(); + setServerService('xmlrpc/object'); + netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess'); + arrFinalList = []; + var xmlRpcClient = getXmlRpc(); + var cmbSearchList = document.getElementById('listSearchBox'); + var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{}); + strDbName.data = branchobj.getCharPref("serverdbname"); + var struid = xmlRpcClient.createType(xmlRpcClient.INT,{}); + struid.data = branchobj.getIntPref('userid'); + var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{}); + strpass.data = branchobj.getCharPref("password"); + var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{}); + strobj.data = 'thunderbird.partner'; + var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{}); + strmethod.data = 'search_contact'; + var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{}); + strname.data = getSenderEmail(); + + xmlRpcClient.asyncCall(listSearchwebdocumentHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6); +} + + function searchContact() { var branchobj = getPref();