X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Futils.js;h=0474ae2361b21f8c28cc71d3dd75883e6ec2ac87;hb=181cd75a7b027c398cc382974bc9f97cba8c48b3;hp=64a266d721951cd2f1752e7b73cad97dfd2cafe1;hpb=12aba8d6c76b53b221b3bcf9eeffe3ab40f3e767;p=fa-stable.git

diff --git a/js/utils.js b/js/utils.js
index 64a266d7..0474ae23 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -35,9 +35,10 @@ function disp_msg(msg, cl) {
 // 
 JsHttpRequest.request= function(trigger, form, tout) {
 //	if (trigger.type=='submit' && !validate(trigger)) return false;
-	tout = tout | 3000;	// default timeout value
-	set_mark(tout>5000 ? 'progressbar.gif' : 'ajax-loader.gif');
-	JsHttpRequest._request(trigger, form, tout, 2);
+	tout = tout | 6000;	// default timeout value
+	document.getElementById('msgbox').innerHTML='';
+	set_mark(tout>10000 ? 'progressbar.gif' : 'ajax-loader.gif');
+	JsHttpRequest._request(trigger, form, tout, 0);
 }
 
 JsHttpRequest._request = function(trigger, form, tout, retry) {
@@ -104,7 +105,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
 			// seek element by id if there is no elemnt with given name
 			  objElement = document.getElementsByName(id)[0] || document.getElementById(id);
     		  if(cmd=='as') {
-				  eval("objElement.setAttribute('"+property+"',"+data+");");
+				  eval("objElement.setAttribute('"+property+"','"+data+"');");
 			  } else if(cmd=='up') {
 //				if(!objElement) alert('No element "'+id+'"');
 				if(objElement) {
@@ -211,19 +212,24 @@ function price_format(post, num, dec, label, color) {
 	if(isNaN(num))
 		num = "0";
 	sign = (num == (num = Math.abs(num)));
+	var max = dec=='max';
+	if(max) dec = 15 - Math.floor(Math.log(Math.abs(num)));
 	if(dec<0) dec = 2;
 	decsize = Math.pow(10, dec);
 	num = Math.floor(num*decsize+0.50000000001);
 	cents = num%decsize;
 	num = Math.floor(num/decsize).toString();
 	for( i=cents.toString().length; i<dec; i++){
-		cents = "0" + cents;
+		cents = "0"+cents;
 	}
+	if (max) // strip trailing 0
+		cents = cents.toString().replace(/0+$/,'');
 	for (var i = 0; i < Math.floor((num.length-(1+i))/3); i++)
 		num = num.substring(0,num.length-(4*i+3))+user.ts+
 			num.substring(num.length-(4*i+3));
 	 num = ((sign)?'':'-') + num;
-	 if(dec!=0) num = num + user.ds + cents;
+	if(dec!=0 && (!max || cents!=0))
+		num = num + user.ds + cents;
 	if(label)
 	    el.innerHTML = num;
 	else