[CLEAN] clean config link contact and push document

bzr revid: mva@openerp.com-20111221090138-5ei80yd2ltdsyf7b

6 files changed, 7 insertions, 39 deletions

diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
index 692627754d8..c4fffb61510 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
index 0d1035d3082..a4c384f6038 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
@@ -8,17 +8,8 @@
 	<script type="text/javascript" src="chrome://openerp_plugin/content/js/tiny_xmlrpc.js"></script>
 	<script type="text/javascript" src="chrome://openerp_plugin/content/js/tools.js"></script>
 	<script type="text/javascript" src="chrome://openerp_plugin/content/js/create.js"></script>
-	<!--<groupbox id="contact" >
-	  <hbox>
-	  	<label  align="right" id="partner"  value="&selectpartner.value;" width="90" class="text-prompt"/>
-	    <textbox id="txtselectpartner" readonly="true" value="" width="170"/>
-		<button label="&bsearch.label;" oncommand="window.open('chrome://openerp_plugin/content/selectpartner.xul', '', 'chrome', 'resizable=yes');" image="&imagesearch.value;"/> 
-	  </hbox>
-	</groupbox>-->
 	<groupbox id="information" >
-		<!--<separator class="groove-thin" orient="horizontal" width="90"/> -->
 		<caption label="Address Detail" />
-		<!--<separator class="groove-thin" orient="horizontal" width="90"/> -->
 		<grid flex="1">
   			<columns>
 				<column />
@@ -38,8 +29,8 @@
 	    <separator class="groove-thin" orient="horizontal" width="90"/> 
 	</groupbox>
 	<hbox align="right">
-  		<button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
-  		<button label="&ok.label;" image="&imageok.value;" oncommand="createContact();"/>
-  		<button label="link to a partner" image="&imageok.value;" oncommand="createContact();"/>
+  		<button label="cancel" image="&imagecancel.value;" oncommand="close();" />
+  		<button label="create partner" image="&imageok.value;" oncommand="createContact();"/>
+  		<button label="link to a partner" image="&imageok.value;" oncommand="window.open('chrome://openerp_plugin/content/selectpartner.xul', '', 'chrome', resizable='yes');"/>
 	</hbox>
 </window>
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/overlay.js b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/overlay.js
index ab184213343..819f1491d6a 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/overlay.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/overlay.js
@@ -199,6 +199,7 @@ function open_document() {
     var strobj = get_rpc_string(xmlRpcClient, 'plugin.handler');

     

     var eml_string = getMessage(messageUri);

+    setPreference('email_text', eml_string);

     var email = get_rpc_string(xmlRpcClient, eml_string);

     xmlRpcClient.asyncCall(listDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod, email],6);

 }

diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/push.js b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/push.js
index 95935853138..a20ea17e8a1 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/push.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/push.js
@@ -1,8 +1,4 @@
-
-
 //xmlrpc request handler for list of search object exist in database or not.
-
-
 var DocumentTypeHandler = {
     onResult: function(client, context, result) {
         netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
@@ -48,7 +44,6 @@ function getDocumentType(){
     xmlRpcClient.asyncCall(DocumentTypeHandler,null,'execute',[strDbName,struid,strpass,strobj,strmethod], 5);
 }
 
-
 /**
  * Return the current operation :
  *  add or create
@@ -146,7 +141,7 @@ var pushHandler = {
         var message = result.QueryInterface(Components.interfaces.nsISupportsCString);
         log_message(message)
         alert(message)
-
+	    window.close();
     },
     
     onFault: function (client, ctxt, fault) {
@@ -190,4 +185,3 @@ function push() {
 }
 
 
-
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
index 2af0fa975c4..8619727346d 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
@@ -12,15 +12,6 @@
 <menubar id="mail-menubar" >

     <menu insertafter="messageMenu" id="menu_openerp" label="&openerpMenu.label;" accesskey="&openerpMenu.accesskey;"> 

         <menupopup id="taskPopup">

-                      <!--

-            <menuseparator/>

-            <menuitem id="tiny-plugin4" label="&tinypluginconfig;"

-                      oncommand="check(searchmail);"

-                      image="&menuicon.value;"

-                      class="menuitem-iconic"

-                      tooltiptext="&pluginconfigvalue.value;"

-                      />

-            <menuseparator/>-->

             <menuitem id="tiny-openpartner" label="&openpartner.value;"

                       oncommand="check(open_partner);"

                       image="&menuicon.value;"

@@ -45,15 +36,6 @@
 </menubar>

 

 

-<!--

-<toolbarpalette id="MailToolbarPalette">

-    <toolbarbutton id="GA-button"

-        class="toolbarbutton-1"

-        image="&menuicon.value;"

-        label= "Push"

-        oncommand="check(searchmail);" />

-</toolbarpalette> 

--->

 <toolbarpalette id="MailToolbarPalette">

     <toolbarbutton id="GA-button2"

         class="toolbarbutton-1"

diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul
index b999bc8c33d..db1839ba156 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul
@@ -24,8 +24,8 @@
 <description></description>
 <hbox>
   <spacer width="45"/>
-  <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
-  <button label="&select.label;" image="&imageok.value;" oncommand="selectPartner();close();"/>
+  <button label="cancel" image="&imagecancel.value;" oncommand="close();" />
+  <button label="link" image="&imageok.value;" oncommand="selectPartner();window.close();"/>
 </hbox>
 
 </window>