[MERGE] MERGE with lp:~openerp-dev/openobject-addons/jam-dev-addons1
bzr revid: sbh@tinyerp.com-20110128092056-mioaapmlpk8hq0lr
This commit is contained in:
commit
0180966dd5
Binary file not shown.
Binary file not shown.
|
@ -196,12 +196,11 @@ function getPredefinedFolder(type) {
|
||||||
|
|
||||||
var fname = msgDate8601string+"-"+subj+"-"+hdr.messageKey;
|
var fname = msgDate8601string+"-"+subj+"-"+hdr.messageKey;
|
||||||
}
|
}
|
||||||
|
var rand1=Math.floor(Math.random()*100000)
|
||||||
|
var rand2=Math.floor(Math.random()*100000)
|
||||||
|
fname = rand1+'openerp-eml'+rand2
|
||||||
setFileName(fname)
|
setFileName(fname)
|
||||||
fname = fname.replace(/[\x00-\x19]/g,"_");
|
fname = fname.replace(/[\x00-\x19]/g,"_");
|
||||||
if (mustcorrectname)
|
|
||||||
fname = nametoascii(fname);
|
|
||||||
else
|
|
||||||
fname = fname.replace(/[\/\\:,<>*\?\"\|]/g,"_");
|
|
||||||
return fname;
|
return fname;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1389,7 +1389,6 @@ function getPartnerList(){
|
||||||
xmlRpcClient.asyncCall(listPartnerHandler,cmdPartnerList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
|
xmlRpcClient.asyncCall(listPartnerHandler,cmdPartnerList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//function to create the xmlrpc supported variables for xmlrpc request
|
//function to create the xmlrpc supported variables for xmlrpc request
|
||||||
function dictcontact(a,b){
|
function dictcontact(a,b){
|
||||||
var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
|
var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
|
||||||
|
|
Loading…
Reference in New Issue