X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Fallocate.js;h=707bdf8ef841afd4ff4c9fc94a7d2aa45ccffc13;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hp=077af675ed92af4861b2dca6c43ae69d5c09aefb;hpb=9f3538fb03c7c7a57bf4b14fd4966d37588e9026;p=fa-stable.git

diff --git a/js/allocate.js b/js/allocate.js
index 077af675..707bdf8e 100644
--- a/js/allocate.js
+++ b/js/allocate.js
@@ -1,28 +1,70 @@
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+function focus_alloc(i) {
+    save_focus(i);
+	i.setAttribute('_last', get_amount(i.name));
+}
+
+function blur_alloc(i) {
+
+	var last = +i.getAttribute('_last')
+	var left = get_amount('left_to_allocate', 1); 
+	var cur = Math.min(get_amount(i.name), get_amount('maxval'+i.name.substr(6), 1), last+left)
+
+	price_format(i.name, cur, user.pdec);
+	change = cur-last;
+
+	var total = get_amount('total_allocated', 1)+change;
+		left -= change;
+	
+	price_format('left_to_allocate', left, user.pdec, 1, 1);
+	price_format('total_allocated', total, user.pdec, 1, 1);
+}
+
 function allocate_all(doc) {
 	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)<=left){
-	    left-=unallocated-amount;
-	    total+=unallocated-amount;
-	    amount=unallocated;
-	}else{
-	  total+=left;
-	  amount+=left;
-	  left=0;
+	total -=  (amount-unallocated);
+	left += (amount-unallocated);
+	amount = unallocated;
+	if(left<0) {
+		total  += left;
+		amount += left;
+		left = 0;
 	}
 	price_format('amount'+doc, amount, user.pdec);
-	price_format('left_to_allocate', left, user.pdec, 1);
-	price_format('total_allocated', total, user.pdec, 1);
+	price_format('left_to_allocate', left, user.pdec, 1,1);
+	price_format('total_allocated', total, user.pdec, 1, 1);
 }
+
 function allocate_none(doc) {
 	amount = get_amount('amount'+doc);
 	left = get_amount('left_to_allocate', 1);
 	total = get_amount('total_allocated', 1);
-	price_format('left_to_allocate',amount+left, user.pdec, 1);
+	price_format('left_to_allocate',amount+left, user.pdec, 1, 1);
 	price_format('amount'+doc, 0, user.pdec);
-	price_format('total_allocated', total-amount, user.pdec, 1);
-}
\ No newline at end of file
+	price_format('total_allocated', total-amount, user.pdec, 1, 1);
+}
+
+var allocations = {
+	'.amount': function(e) {
+		e.onblur = function() {
+			blur_alloc(this);
+		  };
+		e.onfocus = function() {
+			focus_alloc(this);
+		};
+	}
+}
+
+Behaviour.register(allocations);