From 082b0f00ec5292669a82a0c611ef67650282a7c4 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Fri, 21 Mar 2008 17:11:58 +0000
Subject: [PATCH] Improved javascript allocations

---
 includes/ui/ui_view.inc                      | 37 +++++++++++++-------
 purchasing/allocations/supplier_allocate.php |  6 ++--
 sales/allocations/customer_allocate.php      |  6 ++--
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 9f0e4450..08402fca 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1076,7 +1076,7 @@ function add_js_user_num() {
 
 	$js =
 	"<script language=\"javascript\">
-function price_format(post, num, dec) {
+function price_format(post, num, dec, label) {
 	//num = num.toString().replace(/\\$|\\,/g,'');
 	if(isNaN(num))
 		num = \"0\";
@@ -1094,9 +1094,15 @@ function price_format(post, num, dec) {
 			num.substring(num.length-(4*i+3));
 	 num = ((sign)?'':'-') + num;
 	 if(dec!=0) num = num + '".$ds."' + cents;
-	document.getElementsByName(post)[0].value = num;
+	if(label)
+	    document.getElementById(post).innerHTML = num;
+	else
+	    document.getElementsByName(post)[0].value = num;
 	}
-	function get_amount(doc) {
+	function get_amount(doc, label) {
+	    if(label)
+		var val = document.getElementById(doc).innerHTML;
+	    else
 		var val = document.getElementsByName(doc)[0].value;
 		val = val.replace(/\\".$ts."/g,'');
 		val = val.replace(/\\".$ds."/g,'.');
@@ -1110,25 +1116,32 @@ function add_js_allocate() {
 	$source =
 	"<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);
+	var total = get_amount('total_allocated', 1);
+	var left = get_amount('left_to_allocate', 1);
+
 	if(unallocated<amount) amount = unallocated;
-	if((unallocated-amount)<=alloc){
-		alloc-=unallocated-amount;
-	amount=unallocated;
+	if((unallocated-amount)<=left){
+	    left-=unallocated-amount;
+	    total+=unallocated-amount;
+	    amount=unallocated;
 	}else{
-	amount=amount+alloc;
-	alloc=0;
+	total+=left;
+	amount+=left;
+	left=0;
 	}
 	price_format('amount'+doc, amount, ".user_price_dec().");
-	price_format('left_to_allocate', alloc, ".user_price_dec().");
+	price_format('left_to_allocate', left, ".user_price_dec().", 1);
+	price_format('total_allocated', total, ".user_price_dec().", 1);
 	}
 	function allocate_none(doc) {
 	amount = get_amount('amount'+doc);
-	left = get_amount('left_to_allocate');
-	price_format('left_to_allocate',amount+left, ".user_price_dec().");
+	left = get_amount('left_to_allocate', 1);
+	total = get_amount('total_allocated', 1);
+	price_format('left_to_allocate',amount+left, ".user_price_dec().", 1);
 	price_format('amount'+doc, 0, ".user_price_dec().");
+	price_format('total_allocated', total-amount, ".user_price_dec().", 1);
 	}
 	</script>";
 	add_js_user_num();
diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php
index a0e3b86f..0a85f478 100644
--- a/purchasing/allocations/supplier_allocate.php
+++ b/purchasing/allocations/supplier_allocate.php
@@ -227,7 +227,7 @@ function edit_allocations_for_transaction($type, $trans_no)
        	}
 		
         label_row(_("Total Allocated"), number_format2($total_allocated,user_price_dec()),
-        	"colspan=6 align=right", "align=right");
+        	"colspan=6 align=right", "align=right id='total_allocated'");
         if (-$_SESSION['alloc']->amount - $total_allocated < 0)
         {
         	$font1 = "<font color=red>";
@@ -237,11 +237,11 @@ function edit_allocations_for_transaction($type, $trans_no)
         	$font1 = $font2 = "";
 		$left_to_allocate = price_format(-$_SESSION['alloc']->amount - $total_allocated); 
         label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2, "colspan=6 align=right", 
-        	"nowrap align=right");
+        	"nowrap align=right id='left_to_allocate'");
 		end_table();		
 
 		hidden('TotalNumberOfAllocs', $counter);
-		hidden('left_to_allocate', $left_to_allocate);
+//		hidden('left_to_allocate', $left_to_allocate);
     	echo "<br><center>";
        	submit('UpdateDisplay', _("Update"));
        	echo "&nbsp;";
diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index 6d09d766..e1fd9ea2 100644
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -226,7 +226,7 @@ function edit_allocations_for_transaction($type, $trans_no)
        	}
 
        	label_row(_("Total Allocated"), price_format($total_allocated),
-       		"colspan=6 align=right", "nowrap align=right");
+       		"colspan=6 align=right", "nowrap align=right id='total_allocated'");
         if ($_SESSION['alloc']->amount - $total_allocated < 0)
         {
         	$font1 = "<font color=red>";
@@ -237,11 +237,11 @@ function edit_allocations_for_transaction($type, $trans_no)
 		$left_to_allocate = $_SESSION['alloc']->amount - $total_allocated;
 		$left_to_allocate = price_format($left_to_allocate);
         label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2,
-	    	"colspan=6 align=right ", "nowrap align=right");
+	    	"colspan=6 align=right ", "nowrap align=right id='left_to_allocate'");
         end_table(1);
 
        	hidden('TotalNumberOfAllocs', $counter);
-		hidden('left_to_allocate', $left_to_allocate);
+//		hidden('left_to_allocate', $left_to_allocate);
        	submit_center_first('UpdateDisplay', _("Update"));
        	submit('Process', _("Process"));
 	}
-- 
2.30.2