diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2010-10-07 11:26:58 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2010-10-07 11:26:58 +0530 |
| commit | d85bb015ea9c63b4bf904fdcd8b7c756c2588fe3 (patch) | |
| tree | 1421d9f03ab9246d73f1113a7ac031f553c9b2d7 | |
| parent | 2e6f709e1ce4602844a08d7874ae90a29a3fd28b (diff) | |
| parent | 5141d410ec614b2e965ad18817f31c5c126abafe (diff) | |
[MERGE] thunderbird: openPartner and OpenDocument seem ok
bzr revid: hmo@tinyerp.com-20101007055658-nqctj2132yz6ze29
| -rw-r--r-- | addons/thunderbird/plugin/openerp_plugin.xpi | bin | 155027 -> 154846 bytes | |||
| -rw-r--r-- | addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar | bin | 73000 -> 72910 bytes | |||
| -rwxr-xr-x | addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js | 8 | ||||
| -rwxr-xr-x | addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul | 2 | ||||
| -rwxr-xr-x | addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js | 6 |
5 files changed, 6 insertions, 10 deletions
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi Binary files differindex c6ff61c9490..b094c776c31 100644 --- a/addons/thunderbird/plugin/openerp_plugin.xpi +++ b/addons/thunderbird/plugin/openerp_plugin.xpi diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar Binary files differindex e53c9147ca0..fcc567c7f13 100644 --- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar +++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar 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 d028b4ab3ef..f2fbc1f3d15 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 @@ -198,9 +198,7 @@ var openPartnerHandler = { if (parseInt(partner_id) > 0){ var t = weburl + "/openerp/form/view?model=res.partner&id="+partner_id; - alert(t + ":" + " " + "\n\n" + "You can copy this URL into your WebBrowser if URL is not redirected automatic."); - - window.open(t); + window.open(t, "", "chrome","resizable=yes,scrollbars=yes,status=yes"); }
else{
@@ -295,6 +293,7 @@ function open_partner() searchPartner(senderemail);
}
+ var listDocumentHandler = {
onResult: function(client, context, result) { netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess'); @@ -304,8 +303,7 @@ var listDocumentHandler = { weburl = getWebServerURL(); var t = weburl + "/openerp/form/view?model=" + model +"&id=" + res_id; - alert(t + ":" + " " + "\n\n" + "You can copy this URL into your WebBrowser if URL is not redirected automatic."); - window.open(t); + window.open(t, "", "chrome","resizable=yes,scrollbars=yes,status=yes"); },
onFault: function (client, ctxt, fault) {
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 7987bd679a9..e2c3b3b7cee 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 @@ -57,5 +57,5 @@ label= "Open Document"
oncommand="open_document();" />
</toolbarpalette>
-
+ </overlay>
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 3d46e06c616..40552689a03 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 @@ -1831,10 +1831,8 @@ function testConnection(){ function testConnection_web(){ var branchobj = getPref(); weburl = getWebServerURL(); - var urlport = weburl - alert(urlport + " " + "\n\n" + "You can copy this URL into your WebBrowser if URL is not redirected automatic."); - window.close(); - window.open(urlport); + alert(weburl); + window.open(weburl, "", "chrome","resizable=yes,scrollbars=yes,status=yes"); } |
