X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=84eb6fb3fb2569e1fc5e931a57acc7dbd1b521b2;hb=067ad81914f0b0c7726473f9425644cd9600c250;hp=639aea0b9acdc661867b09e92dd9029d0e1432fc;hpb=d746d3fde3490592d30b75d31dd8622d09c997d0;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 639aea0b..84eb6fb3 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1066,28 +1066,66 @@ document.write(\"<div id='CC'></div>\");
 ";
 	return $js;
 }
+//
+//	Javascript conversions to/from user numeric format.
+//
+function get_js_user_num() {
+	global $thoseps, $decseps;
+	$ts = $thoseps[user_tho_sep()];
+	$ds = $decseps[user_dec_sep()];
+
+	$js =
+	"<script language=\"javascript\">
+function price_format(post, num) {
+	//num = num.toString().replace(/\\$|\\,/g,'');
+	if(isNaN(num))
+		num = \"0\";
+	sign = (num == (num = Math.abs(num)));
+	num = Math.floor(num*100+0.50000000001);
+	cents = num%100;
+	num = Math.floor(num/100).toString();
+	if(cents<10)
+		cents = \"0\" + cents;
+	for (var i = 0; i < Math.floor((num.length-(1+i))/3); i++)
+		num = num.substring(0,num.length-(4*i+3))+'".$ts."'+
+				num.substring(num.length-(4*i+3));
+	document.getElementsByName(post)[0].value = (((sign)?'':'-') + num + '".$ds."' + cents);
+		}
+	function get_amount(doc) {
+		var val = document.getElementsByName(doc)[0].value;
+		val = val.replace(/\\".$ts."/g,'');
+		val = val.replace(/\\".$ds."/g,'.');
+		return 1*val;
+	}
+	</script>";
+
+	return $js;
+}
 
 function get_js_allocate() {
-	return "<script>function allocate_all(doc) {
-	var alloc = 1*document.getElementsByName('left_to_allocate')[0].value;
-	var amount = 1*document.getElementsByName('amount'+doc)[0].value;
-	var unallocated = 1*document.getElementsByName('un_allocated'+doc)[0].value;
+	return get_js_user_num() .
+			"<script>
+	function allocate_all(doc) {
+	var alloc = get_amount('left_to_allocate');
+	var amount = get_amount('amount'+doc);
+	var unallocated = get_amount('un_allocated'+doc);
 	if(unallocated<amount) amount = unallocated;
-	if( (unallocated-amount)<=alloc){
+	if((unallocated-amount)<=alloc){
 		alloc-=unallocated-amount;
 	amount=unallocated;
 	}else{
 	amount=amount+alloc;
 	alloc=0;
 	}
-	document.getElementsByName('amount'+doc)[0].value = amount;
-	document.getElementsByName('left_to_allocate')[0].value = alloc;
+	price_format('amount'+doc, amount);
+	price_format('left_to_allocate', alloc);
 	}
 	function allocate_none(doc) {
-		amount = document.getElementsByName('amount'+doc)[0];
-	document.getElementsByName('left_to_allocate')[0].value +=
-			amount.value;
-	amount.value=0;  }
+	amount = get_amount('amount'+doc);
+	left = get_amount('left_to_allocate');
+	price_format('left_to_allocate',amount+left);
+	price_format('amount'+doc, 0);
+	}
 	</script>";
 }