[MERGE]: Merge with lp:openobject-addons-trunk

bzr revid: ksa@tinyerp.co.in-20100817083247-9m1lri7au9yla453

6 files changed, 23 insertions, 28 deletions

diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index 0f9243510d2..142e2839c6e 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
index 3c322b423f5..8dd02dae92c 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/config.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
index 5757897de96..a9afa70e10c 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
@@ -1,8 +1,6 @@
 
 function config_close()
 {
-	//window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
-    //ksa
    window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
 	window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
 }
@@ -62,13 +60,10 @@ function config_ok()
 	}
 	setServer("http://"+document.getElementById('txtcurl').value +":" + document.getElementById('txtcport').value);
 	window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
-    //ksa
     window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
 }
 function openConfigChange()
 {
-	//window.open("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
-    //ksa
     window.close("chrome://openerp_plugin/content/config.xul", "", "chrome");
     window.open("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
 }
@@ -144,7 +139,7 @@ function deleteDocument(){
 		document.getElementById("listObjectListBox").removeItemAt(document.getElementById("listObjectListBox").selectedIndex)
 	}
 	else{
-		alert("No Document Selected");
+		alert("Please Select Any One Document ");
 	}
 }
 
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
index d3d551d63e8..bfcfb40a544 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
@@ -27,7 +27,7 @@
   <groupbox id="address">
     <hbox>
         <caption label="&postaladdress.value;" />
-        <spacer width="300"/>
+        <spacer width="290"/>
      <vbox>
         <caption label="&communication.value;" />
      </vbox>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/plugin.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/plugin.xul
index 45c552452bb..ed064b3dfdd 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/plugin.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/plugin.xul
@@ -16,7 +16,7 @@
 <hbox id="root">
    <vbox width="400">
       <groupbox height="30" id="existsobjectgroup" width="400">
-         <caption label="&gptinyobj.label;" />
+         <caption label="&gptinyobj.label;"/>
 	   <hbox>
 	   <label id="lblsearch" control="txtvalueobj" value="&search.label;"/>
 	   <textbox id="txtvalueobj" size="30"/>
@@ -26,8 +26,7 @@
 	  </vbox> 
 	  <hbox align="center">
 	   <image src='chrome://tiny_plugin/skin/perform.gif'/>
-	    <checkbox id="cbxselectall" oncommand="selectAllCheckbox();" checked="false"/>
-        <caption label="&cbxselectall.label;" />
+	    <checkbox id="cbxselectall" oncommand="selectAllCheckbox();" label="&cbxselectall.label;" checked="false"/>
 	    <spacer width="10"/>
       
 	  </hbox>
@@ -54,7 +53,6 @@
       <groupbox id="newobjectgroup" align="center" width="170" height="375">
 	<caption label="&newobject.label;" />
 	<hbox>
-	<label id="lblex" value=" "/>
          <label id="lblex3" control="section" value="&object.label;"/>
          <menulist id="section" width="150">
            <menupopup>
@@ -81,7 +79,7 @@
   <label id="lblex" value=" "/>
   <label id="lblex" value=" "/>
   <hbox align="right">
-  <spacer width="330"/>
+  <spacer width="300"/>
 	    <button label="&close.label;" accesskey="l" image="&imagecancel.value;" oncommand="win_close();"/>
     </hbox>
     
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 b5057a8cd09..2d3178d626b 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
@@ -151,7 +151,7 @@ var rpc= {
 function handler_function( result ) {
 	if ( rpc.onfault( result ) ) { alert( result[0] + "\n" + result[1] ); return; }
 	else{
-		alert("got result>>>>"+result)	
+		alert("got result"+result)	
 	}
 }
 
@@ -1079,7 +1079,7 @@ var listSearchCheckboxHandler = {
 		var count = arrMethodList.Count();
 		var close=0;
 		if(count == 0  && popup_display != "no"){
-			alert("No records Found");
+			alert("No Records Found");
 			return false;
 		}
 		else if(count ==2 )
@@ -1124,10 +1124,10 @@ var listSearchCheckboxHandler = {
 				arrDataPair[0] = er_val[0].QueryElementAt(j, Components.interfaces.nsISupportsCString)
 				arrSearchList1[j]=arrDataPair;
 			}
-			alert( arrSearchList1 + "  model not exists")
+			alert( arrSearchList1 + "  Model not exists")
 			if (close == 1)
 			{
-				alert("No records Found");
+				alert("No Records Found");
 				return false;
 			}
 		}
@@ -1197,7 +1197,7 @@ function searchCheckbox()
 {
 	var checkboxlist = getnamesearch();
 	if(checkboxlist.length == 0){
-		alert("Select One or More Document");
+		alert("Please Select One or More Document");
 		return false;
 	}
 	var branchobj = getPref();
@@ -1387,12 +1387,15 @@ function upload_archivemail()
     list_documents = document.getElementById('listSearchBox')
     var context = []
     var cnt = list_documents.selectedCount
+    var res_id = [];
+    var model = [];
 	for(i=0;i<cnt;i++)
 	{	
         var object = list_documents.getSelectedItem(i);
 		var eml_string = parse_eml();
-        var model = object.label;
-        var res_id = object.value;
+
+        model[i] = object.label;
+        res_id[i] = object.value;
 		var branchobj = getPref();
 		setServerService('xmlrpc/object');
 		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
@@ -1408,12 +1411,12 @@ function upload_archivemail()
 		var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
 		strobj.data = 'thunderbird.partner';
 		var resobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-        var a = ['model', 'res_id','message'];
-	    var b = [model, res_id,eml_string];
-        var arrofarr = dictcontact(a,b)
+       }
+        var a = ['model','res_id','message'];
+	    var b = [[model],[res_id],eml_string];
+        var arrofarr = dictcontact(a,b);
         xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
-        alert("Mail Archive Successfully");
-      }
+        alert("Mail Archived Successfully");
 		window.close();
     
 }
@@ -1444,7 +1447,7 @@ function create_archivemail(){
 		var b = [object, eml_string];
 		var arrofarr = dictcontact(a,b);
 		xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
-        alert("Mail Archive Successfully");
+        alert("Document Created Successfully");
 		}
     	window.close();
 	}
@@ -1660,7 +1663,7 @@ var listLoginHandler = {
 		if(login.type == 12){
 			login = result.QueryInterface(Components.interfaces.nsISupportsPRInt32)
 			setUserId(login.data);
-			alert('Successful Login To OpenERP');
+			alert('Successfully Login To OpenERP');
             window.close();
 		}
 		else{
@@ -1680,7 +1683,7 @@ var listLoginHandler = {
 function testConnection(){
 	if (getconnect_server() == "false")
 	{
-		alert("No Server Running..."+" "+getServer())
+		alert("Server is Not Running...Please check it!!"+" "+getServer())
 		return false;
 	}
 	if (getDBList()=="false")
@@ -1764,7 +1767,6 @@ var listCreatePartnerHandler = {
 	onResult: function(client, context, result) {
 		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
 		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
-		
 		if(typeof(createId.data) == 'number' && createId!=0){
 			window.close();
 		}