X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Fallocate.js;h=707bdf8ef841afd4ff4c9fc94a7d2aa45ccffc13;hb=e771cab507c120f329e50a71807dd4c53c0ace96;hp=a26bcebaef26b4d999f1c35e817948539ca2667e;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/js/allocate.js b/js/allocate.js
index a26bceba..707bdf8e 100644
--- a/js/allocate.js
+++ b/js/allocate.js
@@ -1,12 +1,12 @@
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 function focus_alloc(i) {
     save_focus(i);
@@ -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);