Changeset 361

Timestamp:

11/09/07 15:00:09

Author:

brieb

Message:

Fixed JavaScript? numberToCurrency function (it was not rounding properly)

Files:

• trunk/phpbms/common/javascript/common.js (modified) (1 diff)
• trunk/phpbms/modules/bms/javascript/invoice.js (modified) (2 diffs)

trunk/phpbms/common/javascript/common.js

@@ -673 +673 @@
-
-function numberToCurrency(number){
+        
-        var currency="";
+        
-        if(isNaN(parseFloat(number))) number=0;
-
-        if(number<0)
-                currency+="-";
-
-
+
+
+
+
+
-        if(number>0 && number <0)
-                currency+="0";
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        var objRegExp  = new RegExp('(-?[0-9]+)([0-9]{3})');
+
-        while(objRegExp.test(withThousands))
-       withThousands = withThousands.replace(objRegExp, '$1'+THOUSANDS_SEPARATOR+'$2');
-
-
-
-
+
-        currency+=withThousands;
+
-        if(CURRENCY_ACCURACY!=0)
-                currency+=DECIMAL_SYMBOL+lessthanone;
+                
-        return currency;
+        
-}
-

trunk/phpbms/modules/bms/javascript/invoice.js

@@ -1078 +1078 @@
-        
-        //calculate and reformat discount
-,discountValue
+
-        if(discountFromID.value=="" || discountFromID.value=="0" || discountFromID.value=="0%"){
-                numDiscount=currencyToNumber(thediscount.value);
@@ -1089 +1089 @@
-                }
-        }
-
-discountValue
+
+ numberToCurrency(numDiscount)
-
-        //calculate totaltaxable