Merged changes form main trunk (2.2.8, 2.2.9)

[fa-stable.git] / js / payalloc.js

diff --git a/js/payalloc.js b/js/payalloc.js
index 7bdd991483cac7f689082799c4ae30785006cbf8..a1cbc09ec3334f9c8cf548a69c42c2473f42d5c5 100644 (file)
--- a/js/payalloc.js
+++ b/js/payalloc.js
@@ -14,8 +14,12 @@ function focus_alloc(i) {
 }
 
 function blur_alloc(i) {
-       var change = get_amount(i.name);
-               price_format(i.name, change, user.pdec);                
+               var change = get_amount(i.name);
+               
+               if (i.name != 'amount' && i.name != 'charge' && i.name != 'discount')
+                       change = Math.min(change, get_amount('maxval'+i.name.substr(6), 1))
+
+               price_format(i.name, change, user.pdec);
                if (i.name != 'amount' && i.name != 'charge') {
                        if (change<0) change = 0;
                        change = change-i.getAttribute('_last');