From 2003c56ecdc39c6a403a68ba2d9157508892df09 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Mon, 19 Dec 2011 16:01:26 +0100
Subject: [CLEAN] clean layout

bzr revid: mva@openerp.com-20111219150126-n3mwar6k3bbjtj2u
---
 .../openerp_plugin/chrome/openerp_plugin.jar       | Bin 47697 -> 47737 bytes
 .../chrome/openerp_plugin/content/create.xul       |  13 +++++------
 .../chrome/openerp_plugin/content/overlay.xul      |  24 ++++++++++-----------
 .../chrome/openerp_plugin/content/push_dialog.xul  |   2 +-
 4 files changed, 20 insertions(+), 19 deletions(-)

(limited to 'addons/plugin_thunderbird/plugin/openerp_plugin')

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 05a7279eb78..ba38cc6d354 100644
Binary files a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
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 6ad5bc6b351..0d1035d3082 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,17 @@
 	<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" >
+	<!--<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" style="border:1px solid black">
-		<separator class="groove-thin" orient="horizontal" width="90"/> 
-		<caption label="Contact Information" />
-		<separator class="groove-thin" orient="horizontal" width="90"/> 
+	</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 />
@@ -40,5 +40,6 @@
 	<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();"/>
 	</hbox>
 </window>
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 0df20fc039b..2af0fa975c4 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,12 +12,7 @@
 <menubar id="mail-menubar" >
     <menu insertafter="messageMenu" id="menu_openerp" label="&openerpMenu.label;" accesskey="&openerpMenu.accesskey;"> 
         <menupopup id="taskPopup">
-            <menuitem id="tiny-plugin3" label="&tinyplugin;"
-                      oncommand="window.open('chrome://openerp_plugin/content/config.xul', '', 'chrome', 'resizable=yes');"
-                      image="&menuicon.settings;"
-                      class="menuitem-iconic"
-                      tooltiptext="&pluginconfig.value;"
-                      />
+                      <!--
             <menuseparator/>
             <menuitem id="tiny-plugin4" label="&tinypluginconfig;"
                       oncommand="check(searchmail);"
@@ -25,7 +20,7 @@
                       class="menuitem-iconic"
                       tooltiptext="&pluginconfigvalue.value;"
                       />
-            <menuseparator/>
+            <menuseparator/>-->
             <menuitem id="tiny-openpartner" label="&openpartner.value;"
                       oncommand="check(open_partner);"
                       image="&menuicon.value;"
@@ -39,13 +34,18 @@
                       class="menuitem-iconic"
                       tooltiptext="&opendocumenttooltip.value;"
                       />
-            
+            <menuitem id="tiny-plugin3" label="&tinyplugin;"
+                      oncommand="window.open('chrome://openerp_plugin/content/config.xul', '', 'chrome', 'resizable=yes');"
+                      image="&menuicon.settings;"
+                      class="menuitem-iconic"
+                      tooltiptext="&pluginconfig.value;"
+                      />
         </menupopup>
     </menu>
 </menubar>
 
 
-
+<!--
 <toolbarpalette id="MailToolbarPalette">
     <toolbarbutton id="GA-button"
         class="toolbarbutton-1"
@@ -53,12 +53,12 @@
         label= "Push"
         oncommand="check(searchmail);" />
 </toolbarpalette> 
-
+-->
 <toolbarpalette id="MailToolbarPalette">
     <toolbarbutton id="GA-button2"
         class="toolbarbutton-1"
         image="&partnericon.value;"
-        label= "Partner"
+        label= "Contact"
         oncommand="check(open_partner);"
           />
 </toolbarpalette>
@@ -66,7 +66,7 @@
     <toolbarbutton id="GA-button3"
         class="toolbarbutton-1"
         image="&imagearchive.value;"
-        label= "Document"
+        label= "Documents"
         oncommand="check(open_document);"  />
 </toolbarpalette> 
 
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
index a8d7531e470..33507f6902a 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
@@ -16,4 +16,4 @@
         	<button id="open" label="Open Document" accesskey="c" oncommand="window.close();"/>
         </hbox>  
     </vbox>  
-</window>  
\ No newline at end of file
+</window>  
-- 
cgit v1.2.3


From 6315f91176b654a74114a0a46879371d3a3dca60 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Tue, 20 Dec 2011 10:17:37 +0100
Subject: [CLEAN] clean code

bzr revid: mva@openerp.com-20111220091737-3gl3subplug4vo0r
---
 .../plugin/openerp_plugin/chrome/openerp_plugin.jar | Bin 47737 -> 48391 bytes
 .../chrome/openerp_plugin/content/js/overlay.js     |   3 ++-
 .../chrome/openerp_plugin/content/js/push.js        |  17 ++---------------
 .../chrome/openerp_plugin/content/push_dialog.xul   |   2 +-
 4 files changed, 5 insertions(+), 17 deletions(-)

(limited to 'addons/plugin_thunderbird/plugin/openerp_plugin')

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 ba38cc6d354..86c49c42f7d 100644
Binary files a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
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 2607614e7c8..ab184213343 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
@@ -96,6 +96,7 @@ var openPartnerHandler = {
         open_url(res[URL])
         
         
+        
     },
     onFault: function (client, ctxt, fault) {
 		log_message(fault);
@@ -200,4 +201,4 @@ function open_document() {
     var eml_string = getMessage(messageUri);
     var email = get_rpc_string(xmlRpcClient, eml_string);
     xmlRpcClient.asyncCall(listDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod, email],6);
-}
\ No newline at end of file
+}
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 86596397c99..5528bf6054e 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
@@ -49,23 +49,10 @@ function getDocumentType(){
  *  add or create
  */
 function getOperation() {
-	var operation = document.getElementById('operation').selectedItem;
+	var operation = document.getElementById('operation').value;
 	return operation.value	
 }
 
-function changeForm() {
-	
-	var hidden = false
-	
-	if(getOperation() == "create") {
-		hidden = true
-	}
-	document.getElementById('label_box').hidden = hidden
-	document.getElementById('listSearchBox').hidden = hidden
-	document.getElementById('lblsearch').hidden = hidden
-	document.getElementById('txtvalueobj').hidden = hidden
-	document.getElementById('search_button').hidden = hidden
-}
 
 
 
@@ -141,7 +128,7 @@ var pushHandler = {
         var message = result.QueryInterface(Components.interfaces.nsISupportsCString);
         log_message(message)
         alert(message)
-	    window.close();
+	    window.close("chrome://openerp_plugin/content/push.xul", "", "chrome");
     },
     
     onFault: function (client, ctxt, fault) {
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
index 33507f6902a..4753f0613e6 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
@@ -13,7 +13,7 @@
         <hbox>  
         	<button label="Cancel" accesskey="c" oncommand="window.close();"/>
         	<button id="push_new" label="Push Email" accesskey="a" oncommand="window.open('chrome://openerp_plugin/content/push.xul', '', 'chrome', resizable='yes');"/>
-        	<button id="open" label="Open Document" accesskey="c" oncommand="window.close();"/>
+        	<button id="open" label="Open Document" accesskey="c" oncommand="window.open('chrome://openerp_plugin/content/create_new.xul', '', 'chrome', resizable='yes');"/>
         </hbox>  
     </vbox>  
 </window>  
-- 
cgit v1.2.3


From cd73200f28fa1446076472ef20614d641c0aa305 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Tue, 20 Dec 2011 10:42:57 +0100
Subject: [CLEAN] clean code

bzr revid: mva@openerp.com-20111220094257-8k84worc4a4qy2a9
---
 .../plugin/openerp_plugin/chrome/openerp_plugin.jar | Bin 48391 -> 48660 bytes
 .../chrome/openerp_plugin/content/js/push.js        |  15 ++++++++++++++-
 .../chrome/openerp_plugin/content/push.xul          |   4 +---
 3 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'addons/plugin_thunderbird/plugin/openerp_plugin')

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 86c49c42f7d..4c8e4bfca5b 100644
Binary files a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
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 5528bf6054e..9929ec6317e 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
@@ -49,10 +49,23 @@ function getDocumentType(){
  *  add or create
  */
 function getOperation() {
-	var operation = document.getElementById('operation').value;
+	var operation = document.getElementById('operation').selectedItem;
 	return operation.value	
 }
 
+function changeForm() {
+	
+	var hidden = false
+	
+	if(getOperation() == "create") {
+		hidden = true
+	}
+	document.getElementById('label_box').hidden = hidden
+	document.getElementById('listSearchBox').hidden = hidden
+	document.getElementById('lblsearch').hidden = hidden
+	document.getElementById('txtvalueobj').hidden = hidden
+	document.getElementById('search_button').hidden = hidden
+}
 
 
 
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul
index b9a17df485f..f1a53c917db 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul
@@ -31,9 +31,7 @@
 	    					<label id="lblex3" align="right" width="135" control="section" value="Operation :" class="text-prompt"/>
 	                        <menulist id="operation" width="150" oncommand="changeForm()">
 	                            <menupopup>
-	                            	<menuitem label="Attach to an existing one" value="add"/>
-	                                <menuitem label="Create a new one" value="create"/>
-	                                
+	                            	<menuitem label="Attach to an existing one" value="add"/>	                                
 	                            </menupopup>
 	                        </menulist>
     					</row>
-- 
cgit v1.2.3


From c1bdc2d9248adddcdc26a1a65439e25a6917950d Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Tue, 20 Dec 2011 11:51:34 +0100
Subject: [CLEAN] hidde boxes after action

bzr revid: mva@openerp.com-20111220105134-zkqdw6f8ocnulazg
---
 .../plugin/openerp_plugin/chrome/openerp_plugin.jar | Bin 48660 -> 48604 bytes
 .../chrome/openerp_plugin/content/js/create.js      |   3 ++-
 .../chrome/openerp_plugin/content/js/push.js        |   8 +++++++-
 .../chrome/openerp_plugin/content/push_dialog.xul   |   4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'addons/plugin_thunderbird/plugin/openerp_plugin')

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 4c8e4bfca5b..692627754d8 100644
Binary files a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/create.js b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/create.js
index 21faf9f7949..6670002c9af 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/create.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/create.js
@@ -109,6 +109,7 @@ var listCreateContactHandler = {
 
 //function to create a new contact
 function createContact(){
+    window.close();
     setServerService('xmlrpc/object');
     netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
     var xmlRpcClient = getXmlRpc();
@@ -123,4 +124,4 @@ function createContact(){
     var b = [document.getElementById("txtname").value, document.getElementById("txtemail").value];
     var arrofarr = dictcontact(a,b);
     xmlRpcClient.asyncCall(listCreateContactHandler,null,'execute',[strDbName,struid,strpass,strobj,strmethod,arrofarr, strpartnerid], 7);
-}
\ No newline at end of file
+}
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 9929ec6317e..95935853138 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,4 +1,8 @@
+
+
 //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');
@@ -44,6 +48,7 @@ function getDocumentType(){
     xmlRpcClient.asyncCall(DocumentTypeHandler,null,'execute',[strDbName,struid,strpass,strobj,strmethod], 5);
 }
 
+
 /**
  * Return the current operation :
  *  add or create
@@ -141,7 +146,7 @@ var pushHandler = {
         var message = result.QueryInterface(Components.interfaces.nsISupportsCString);
         log_message(message)
         alert(message)
-	    window.close("chrome://openerp_plugin/content/push.xul", "", "chrome");
+
     },
     
     onFault: function (client, ctxt, fault) {
@@ -155,6 +160,7 @@ var pushHandler = {
 
 
 function push() {
+    window.close();
 	var model_name = document.getElementById('menu_model_list').selectedItem.value;
 	var res_id = 0;
 	if(getOperation() == "add") {
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
index 4753f0613e6..27e8902a6f2 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
@@ -12,8 +12,8 @@
         </hbox>  
         <hbox>  
         	<button label="Cancel" accesskey="c" oncommand="window.close();"/>
-        	<button id="push_new" label="Push Email" accesskey="a" oncommand="window.open('chrome://openerp_plugin/content/push.xul', '', 'chrome', resizable='yes');"/>
-        	<button id="open" label="Open Document" accesskey="c" oncommand="window.open('chrome://openerp_plugin/content/create_new.xul', '', 'chrome', resizable='yes');"/>
+        	<button id="push_new" label="Push Email" accesskey="a" oncommand=" window.close();window.open('chrome://openerp_plugin/content/push.xul', '', 'chrome', resizable='yes');"/>
+        	<button id="open" label="Open Document" accesskey="c" oncommand="window.close();window.open('chrome://openerp_plugin/content/create_new.xul', '', 'chrome', resizable='yes');"/>
         </hbox>  
     </vbox>  
 </window>  
-- 
cgit v1.2.3


From d8ac32e717ac36c42494934c2711feb750226edb Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Wed, 21 Dec 2011 10:01:38 +0100
Subject: [CLEAN] clean config link contact and push document

bzr revid: mva@openerp.com-20111221090138-5ei80yd2ltdsyf7b
---
 .../plugin/openerp_plugin/chrome/openerp_plugin.jar | Bin 48604 -> 48550 bytes
 .../chrome/openerp_plugin/content/create.xul        |  15 +++------------
 .../chrome/openerp_plugin/content/js/overlay.js     |   1 +
 .../chrome/openerp_plugin/content/js/push.js        |   8 +-------
 .../chrome/openerp_plugin/content/overlay.xul       |  18 ------------------
 .../chrome/openerp_plugin/content/selectpartner.xul |   4 ++--
 6 files changed, 7 insertions(+), 39 deletions(-)

(limited to 'addons/plugin_thunderbird/plugin/openerp_plugin')

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
Binary files a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
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>
-- 
cgit v1.2.3


From 4c986c71dec2543acd6b7a37238b810283841542 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Thu, 22 Dec 2011 09:36:15 +0100
Subject: [CLEAN] cleaning code

bzr revid: mva@openerp.com-20111222083615-ot0yvp9ki3ckpvgd
---
 .../plugin/openerp_plugin/chrome/openerp_plugin.jar | Bin 48550 -> 48455 bytes
 .../chrome/openerp_plugin/content/js/tools.js       |   3 ++-
 .../chrome/openerp_plugin/content/overlay.xul       |   4 ++--
 .../chrome/openerp_plugin/content/push_dialog.xul   |   2 +-
 .../chrome/openerp_plugin/content/selectpartner.xul |   2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'addons/plugin_thunderbird/plugin/openerp_plugin')

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 c4fffb61510..518cdaa6192 100644
Binary files a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js
index 44b984ac383..752574ab40f 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js
@@ -31,6 +31,7 @@ function createMenuItem(aLabel, aValue) {
     return item;
 }
 
+    
 function clear_search_box(element) {
 	var cmbSearchList = document.getElementById(element);
 	count = cmbSearchList.itemCount
@@ -78,4 +79,4 @@ function check_connection(callback) {
     	}
     	return callback()
 	}
-}
\ No newline at end of file
+}
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 8619727346d..b87ade0946b 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,14 +12,14 @@
 <menubar id="mail-menubar" >
     <menu insertafter="messageMenu" id="menu_openerp" label="&openerpMenu.label;" accesskey="&openerpMenu.accesskey;"> 
         <menupopup id="taskPopup">
-            <menuitem id="tiny-openpartner" label="&openpartner.value;"
+            <menuitem id="tiny-openpartner" label="contact"
                       oncommand="check(open_partner);"
                       image="&menuicon.value;"
                       class="menuitem-iconic"
                       tooltiptext="&openpartnertooltip.value;"
                       />
 
-            <menuitem id="tiny-opendocument" label="&opendocument.value;"
+            <menuitem id="tiny-opendocument" label="document"
                       oncommand="check(open_document);"
                       image="&menuicon.value;"
                       class="menuitem-iconic"
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
index 27e8902a6f2..b87eadca47d 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>  
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>  
 <!-- Extremely recommended to keep this css include!! -->  
-<window id="rootWnd" title="Register Online!"   onload="load_contact_dialog();" 
+<window id="rootWnd" title="push box"   onload="load_contact_dialog();" 
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">  
     <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>
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 db1839ba156..97d636ee6fe 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
@@ -25,7 +25,7 @@
 <hbox>
   <spacer width="45"/>
   <button label="cancel" image="&imagecancel.value;" oncommand="close();" />
-  <button label="link" image="&imageok.value;" oncommand="selectPartner();window.close();"/>
+  <button label="link" image="&imageok.value;" oncommand="createContact();window.close();"/>
 </hbox>
 
 </window>
-- 
cgit v1.2.3


From cfea271197bebd327207f5a935bac3562191a6d8 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Thu, 22 Dec 2011 11:48:13 +0100
Subject: [CLEAN] create and open in document

bzr revid: mva@openerp.com-20111222104813-nnozkk34jyvx9phr
---
 .../plugin/openerp_plugin/chrome/openerp_plugin.jar | Bin 48455 -> 48520 bytes
 .../chrome/openerp_plugin/content/overlay.xul       |   2 +-
 .../chrome/openerp_plugin/content/push_dialog.xul   |   4 +++-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'addons/plugin_thunderbird/plugin/openerp_plugin')

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 518cdaa6192..6d6489c9abb 100644
Binary files a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
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 b87ade0946b..47c7e3aed5d 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
@@ -20,7 +20,7 @@
                       />
 
             <menuitem id="tiny-opendocument" label="document"
-                      oncommand="check(open_document);"
+                      oncommand="window.open('chrome://openerp_plugin/content/push_dialog.xul', '', 'chrome', 'resizable=yes');"
                       image="&menuicon.value;"
                       class="menuitem-iconic"
                       tooltiptext="&opendocumenttooltip.value;"
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
index b87eadca47d..147b8f08dfd 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
@@ -13,7 +13,9 @@
         <hbox>  
         	<button label="Cancel" accesskey="c" oncommand="window.close();"/>
         	<button id="push_new" label="Push Email" accesskey="a" oncommand=" window.close();window.open('chrome://openerp_plugin/content/push.xul', '', 'chrome', resizable='yes');"/>
-        	<button id="open" label="Open Document" accesskey="c" oncommand="window.close();window.open('chrome://openerp_plugin/content/create_new.xul', '', 'chrome', resizable='yes');"/>
+        	<button id="open" label="Create Document" accesskey="c" oncommand="window.close();window.open('chrome://openerp_plugin/content/create_new.xul', '', 'chrome', resizable='yes');"/>
+        	<button id="opendocument" label="Open Document" accesskey="d" oncommand="check(open_document);"/>
+            <!-- link open document and show create or open but not both-->
         </hbox>  
     </vbox>  
 </window>  
-- 
cgit v1.2.3


From fb306bd2bb9fe99dd1f1b7d30af1e6fc22e94a61 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Thu, 22 Dec 2011 16:17:53 +0100
Subject: [CLEAN] Button open and create in push dialog

bzr revid: mva@openerp.com-20111222151753-2qwkoywvvdh8wvtc
---
 .../plugin/openerp_plugin/chrome/openerp_plugin.jar | Bin 48520 -> 48725 bytes
 .../chrome/openerp_plugin/content/js/dialog.js      |  16 ++++++++++++++++
 .../chrome/openerp_plugin/content/js/overlay.js     |  13 ++++++++-----
 .../chrome/openerp_plugin/content/overlay.xul       |   2 +-
 .../chrome/openerp_plugin/content/push_dialog.xul   |   5 +++--
 .../openerp_plugin/defaults/preferences/tiny.js     |   1 +
 6 files changed, 29 insertions(+), 8 deletions(-)

(limited to 'addons/plugin_thunderbird/plugin/openerp_plugin')

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 6d6489c9abb..d41bad4bf79 100644
Binary files a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js
index 6a57a82a85d..09f5fa01e16 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js
@@ -2,3 +2,19 @@ function load_contact_dialog() {
 	log_message("load contact dialog")
 	
 }
+
+
+function load_document(){
+    log_message("ceci est un test");
+    log_message(getPreference('statutdoc'));
+    log_message("fin de test");
+        if (getPreference('statutdoc')=='open'){
+            document.getElementById('open_document').hidden=false;
+            document.getElementById('open').hidden=true; 
+            }
+        else{           
+            document.getElementById('open_document').hidden=true;
+            document.getElementById('open').hidden=false;
+            }
+    
+}
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 819f1491d6a..0d21af8f1aa 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
@@ -160,14 +160,17 @@ var listDocumentHandler = {
     onResult: function(client, context, result) {
         res = extract_data(result)
         log_message("open document")
+        window.open('chrome://openerp_plugin/content/push_dialog.xul', '', 'chrome', resizable='yes');
         if(res[RES_ID]==0) {
-            alert("Document is not available.");
-            window.open('chrome://openerp_plugin/content/push_dialog.xul', '', 'chrome', resizable='yes');
-            document.getElementById('message_label').setAttribute('value', 'No document was found');
+            //alert("Document is not available.");
+            //document.getElementById('message_label').setAttribute('value', 'No document was found');
+            setPreference('statutdoc','create');
+
         }
         else {
-    		open_url(res[URL])
-        }
+            setPreference('statutdoc', 'open');
+    		//open_url(res[URL]);
+        }        
 
     },
     onFault: function (client, ctxt, fault) {
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 47c7e3aed5d..b87ade0946b 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
@@ -20,7 +20,7 @@
                       />
 
             <menuitem id="tiny-opendocument" label="document"
-                      oncommand="window.open('chrome://openerp_plugin/content/push_dialog.xul', '', 'chrome', 'resizable=yes');"
+                      oncommand="check(open_document);"
                       image="&menuicon.value;"
                       class="menuitem-iconic"
                       tooltiptext="&opendocumenttooltip.value;"
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
index 147b8f08dfd..af54a55ae12 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>  
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>  
 <!-- Extremely recommended to keep this css include!! -->  
-<window id="rootWnd" title="push box"   onload="load_contact_dialog();" 
+<window id="rootWnd" title="push box"   onload="load_contact_dialog();load_document();" 
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">  
     <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/dialog.js"></script>
+    <script type="text/javascript" src="chrome://openerp_plugin/content/js/overlay.js"></script>
 	<vbox>  
     	<hbox>  
         	<label value="Message" id="message_label"/>  
@@ -14,7 +15,7 @@
         	<button label="Cancel" accesskey="c" oncommand="window.close();"/>
         	<button id="push_new" label="Push Email" accesskey="a" oncommand=" window.close();window.open('chrome://openerp_plugin/content/push.xul', '', 'chrome', resizable='yes');"/>
         	<button id="open" label="Create Document" accesskey="c" oncommand="window.close();window.open('chrome://openerp_plugin/content/create_new.xul', '', 'chrome', resizable='yes');"/>
-        	<button id="opendocument" label="Open Document" accesskey="d" oncommand="check(open_document);"/>
+        	<button id="open_document" label="Open Document" accesskey="d" oncommand="check_document();"/>
             <!-- link open document and show create or open but not both-->
         </hbox>  
     </vbox>  
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js b/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
index 1e12ff712d8..6722887f48a 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
@@ -9,6 +9,7 @@ pref("extensions.tiny.username","admin");
 pref("extensions.tiny.password","admin");
 pref("extensions.tiny.senderemail","");
 pref("extensions.tiny.sendername","");
+pref("extensions.tiny.statutdoc","");// add to have a statut to hidde or not the button
 pref("extensions.tiny.receiveremail","");
 pref("extensions.tiny.subject","");
 pref("extensions.tiny.receiveddate","");
-- 
cgit v1.2.3


From 32bffc23307c1e11248f614387eba040d2cdd8cf Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Fri, 23 Dec 2011 11:22:53 +0100
Subject: [CLEAN] cleaning the plugin

bzr revid: mva@openerp.com-20111223102253-yievl616vlyx85kf
---
 .../plugin/openerp_plugin/chrome/openerp_plugin.jar | Bin 48725 -> 48687 bytes
 .../chrome/openerp_plugin/content/create.xul        |   2 +-
 .../chrome/openerp_plugin/content/js/dialog.js      |  10 +++++-----
 .../chrome/openerp_plugin/content/js/overlay.js     |   8 ++------
 .../chrome/openerp_plugin/content/js/tools.js       |   1 -
 .../chrome/openerp_plugin/content/overlay.xul       |   6 +++---
 .../chrome/openerp_plugin/content/push.xul          |   3 +--
 .../chrome/openerp_plugin/content/push_dialog.xul   |  10 +++++-----
 .../openerp_plugin/defaults/preferences/tiny.js     |   1 +
 9 files changed, 18 insertions(+), 23 deletions(-)

(limited to 'addons/plugin_thunderbird/plugin/openerp_plugin')

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 d41bad4bf79..fae6a80e5a1 100644
Binary files a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
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 a4c384f6038..843f3c5b6d3 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
@@ -4,7 +4,7 @@
 <!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/create.dtd">
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"
-	title="&title.label;" onload="load_createContact();" height="250" width="400">
+	title="&title.label;" onload="load_createContact();" >
 	<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>
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js
index 09f5fa01e16..2995a48fa84 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js
@@ -2,12 +2,7 @@ function load_contact_dialog() {
 	log_message("load contact dialog")
 	
 }
-
-
 function load_document(){
-    log_message("ceci est un test");
-    log_message(getPreference('statutdoc'));
-    log_message("fin de test");
         if (getPreference('statutdoc')=='open'){
             document.getElementById('open_document').hidden=false;
             document.getElementById('open').hidden=true; 
@@ -18,3 +13,8 @@ function load_document(){
             }
     
 }
+
+function message_setlabel(){
+    log_message(getPreference('subject'));
+    document.getElementById('message_label').value=getPreference('subject');    
+    }
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 0d21af8f1aa..55d6e057f5f 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
@@ -162,16 +162,12 @@ var listDocumentHandler = {
         log_message("open document")
         window.open('chrome://openerp_plugin/content/push_dialog.xul', '', 'chrome', resizable='yes');
         if(res[RES_ID]==0) {
-            //alert("Document is not available.");
-            //document.getElementById('message_label').setAttribute('value', 'No document was found');
             setPreference('statutdoc','create');
-
         }
         else {
             setPreference('statutdoc', 'open');
-    		//open_url(res[URL]);
-        }        
-
+            setPreference('urldoc', res[URL]);
+        } 
     },
     onFault: function (client, ctxt, fault) {
 		log_message(fault);
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js
index 752574ab40f..c0dad694450 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js
@@ -40,7 +40,6 @@ function clear_search_box(element) {
 	}
 }
 
-
 function open_url(url) {
 	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
     messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
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 b87ade0946b..6e2f1ee875a 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,20 +12,20 @@
 <menubar id="mail-menubar" >
     <menu insertafter="messageMenu" id="menu_openerp" label="&openerpMenu.label;" accesskey="&openerpMenu.accesskey;"> 
         <menupopup id="taskPopup">
-            <menuitem id="tiny-openpartner" label="contact"
+            <menuitem id="tiny-openpartner" label="Contact"
                       oncommand="check(open_partner);"
                       image="&menuicon.value;"
                       class="menuitem-iconic"
                       tooltiptext="&openpartnertooltip.value;"
                       />
 
-            <menuitem id="tiny-opendocument" label="document"
+            <menuitem id="tiny-opendocument" label="Documents"
                       oncommand="check(open_document);"
                       image="&menuicon.value;"
                       class="menuitem-iconic"
                       tooltiptext="&opendocumenttooltip.value;"
                       />
-            <menuitem id="tiny-plugin3" label="&tinyplugin;"
+            <menuitem id="tiny-plugin3" label="Configuration"
                       oncommand="window.open('chrome://openerp_plugin/content/config.xul', '', 'chrome', 'resizable=yes');"
                       image="&menuicon.settings;"
                       class="menuitem-iconic"
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul
index f1a53c917db..e3d2150899e 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul
@@ -28,8 +28,7 @@
 	                        </menulist>
     					</row>
     					<row>
-	    					<label id="lblex3" align="right" width="135" control="section" value="Operation :" class="text-prompt"/>
-	                        <menulist id="operation" width="150" oncommand="changeForm()">
+	    					<menulist id="operation" hidden="true" width="150" oncommand="changeForm()">
 	                            <menupopup>
 	                            	<menuitem label="Attach to an existing one" value="add"/>	                                
 	                            </menupopup>
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
index af54a55ae12..dcbcc84be2b 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
@@ -1,22 +1,22 @@
 <?xml version="1.0"?>  
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>  
 <!-- Extremely recommended to keep this css include!! -->  
-<window id="rootWnd" title="push box"   onload="load_contact_dialog();load_document();" 
+<window id="rootWnd" title="push box"  onload="load_contact_dialog();load_document();message_setlabel();" 
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">  
     <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/dialog.js"></script>
     <script type="text/javascript" src="chrome://openerp_plugin/content/js/overlay.js"></script>
 	<vbox>  
-    	<hbox>  
+    	<hbox height="50px">  
+            <caption label="Subject:" />
         	<label value="Message" id="message_label"/>  
         </hbox>  
-        <hbox>  
+        <hbox align="right">  
         	<button label="Cancel" accesskey="c" oncommand="window.close();"/>
         	<button id="push_new" label="Push Email" accesskey="a" oncommand=" window.close();window.open('chrome://openerp_plugin/content/push.xul', '', 'chrome', resizable='yes');"/>
         	<button id="open" label="Create Document" accesskey="c" oncommand="window.close();window.open('chrome://openerp_plugin/content/create_new.xul', '', 'chrome', resizable='yes');"/>
-        	<button id="open_document" label="Open Document" accesskey="d" oncommand="check_document();"/>
-            <!-- link open document and show create or open but not both-->
+        	<button id="open_document" label="Open Document" accesskey="d" oncommand="open_url(getPreference('urldoc'));window.close();"/>
         </hbox>  
     </vbox>  
 </window>  
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js b/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
index 6722887f48a..9a21e9a6f6c 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
@@ -10,6 +10,7 @@ pref("extensions.tiny.password","admin");
 pref("extensions.tiny.senderemail","");
 pref("extensions.tiny.sendername","");
 pref("extensions.tiny.statutdoc","");// add to have a statut to hidde or not the button
+pref("extensions.tiny.message_label","");// add to message in push dialog
 pref("extensions.tiny.receiveremail","");
 pref("extensions.tiny.subject","");
 pref("extensions.tiny.receiveddate","");
-- 
cgit v1.2.3


From c9768fead1c28893a95f3578ea59244c3a63fa32 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Fri, 23 Dec 2011 12:12:35 +0100
Subject: [CLEAN] cleaning the plugin

bzr revid: mva@openerp.com-20111223111235-b2kywoi6l707lm3a
---
 .../plugin/openerp_plugin/chrome/openerp_plugin.jar | Bin 48687 -> 48733 bytes
 .../chrome/openerp_plugin/content/js/overlay.js     |   2 ++
 2 files changed, 2 insertions(+)

(limited to 'addons/plugin_thunderbird/plugin/openerp_plugin')

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 fae6a80e5a1..a28430396e6 100644
Binary files a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
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 55d6e057f5f..c85e735374e 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
@@ -168,6 +168,8 @@ var listDocumentHandler = {
             setPreference('statutdoc', 'open');
             setPreference('urldoc', res[URL]);
         } 
+       setPreference('message_label',setPreference('subject'));// to have the subject to print on the push dialog       
+
     },
     onFault: function (client, ctxt, fault) {
 		log_message(fault);
-- 
cgit v1.2.3