X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Fallocate.js;h=707bdf8ef841afd4ff4c9fc94a7d2aa45ccffc13;hb=9f832e8ab3c679ab67e5d086a99774dac58e004a;hp=0294137ad3c2561e566a64b763d3acf0cfd245ec;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git

diff --git a/js/allocate.js b/js/allocate.js
index 0294137a..707bdf8e 100644
--- a/js/allocate.js
+++ b/js/allocate.js
@@ -14,12 +14,16 @@ function focus_alloc(i) {
 }
 
 function blur_alloc(i) {
-	var change = get_amount(i.name);
-		price_format(i.name, change, user.pdec);		
-		if(change<0) change = 0;
-		change = change-i.getAttribute('_last');
+
+	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;
-	var left = get_amount('left_to_allocate', 1)-change;
+		left -= change;
 	
 	price_format('left_to_allocate', left, user.pdec, 1, 1);
 	price_format('total_allocated', total, user.pdec, 1, 1);