[Web-erp-svn] SF.net SVN: web-erp:[6972] trunk

[<dai...@us...>]

Revision: 6972
          http://sourceforge.net/p/web-erp/reponame/6972
Author:   daintree
Date:     2014-11-08 23:48:35 +0000 (Sat, 08 Nov 2014)
Log Message:
-----------
Phil: Applied Tims fix to the javascript number sorting problem - thanks Tim

Modified Paths:
--------------
    trunk/doc/Change.log
    trunk/javascripts/MiscFunctions.js

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2014-11-08 05:14:21 UTC (rev 6971)
+++ trunk/doc/Change.log	2014-11-08 23:48:35 UTC (rev 6972)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+9/11/14: Tim: fix to javascript function to sort numbers including formatted numbers with commas.
 8/11/14: Alessandro Saporetti: Fixed the bug that the wrong invoiced quantity result in Z_DeleteInvoice.php.
 7/11/14 Exson: Remove date range from sql when users input the PO number in PO_SelectOSPurchOrder.php.
 06/11/14 Exson: Add code change for table custitem and pricematrix in Z_ChangeStockCode.php.

Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js	2014-11-08 05:14:21 UTC (rev 6971)
+++ trunk/javascripts/MiscFunctions.js	2014-11-08 23:48:35 UTC (rev 6972)
@@ -289,7 +289,7 @@
 		function(a,b) {
 			if (direction=="a") {
 				if (columnClass=="number") {
-					return parseFloat(e[columnNumber].replace(/[,.]/g, '')) - parseFloat(t[columnNumber].replace(/[,.]/g, '')
+					return parseFloat(a[columnNumber].replace(/[,.]/g, '')) - parseFloat(b[columnNumber].replace(/[,.]/g, ''));
 				} else if (columnClass=="date") {
 					da=new Date(a[columnNumber]);
 					db=new Date(b[columnNumber]);
@@ -299,7 +299,7 @@
 				}
 			} else {
 				if (columnClass=="number") {
-					return parseFloat(e[columnNumber].replace(/[,.]/g, '')) - parseFloat(t[columnNumber].replace(/[,.]/g, '')
+					return parseFloat(b[columnNumber].replace(/[,.]/g, '')) - parseFloat(a[columnNumber].replace(/[,.]/g, ''));
 				} else if (columnClass=="date") {
 					da=new Date(a[columnNumber]);
 					db=new Date(b[columnNumber]);
@@ -341,15 +341,13 @@
 		if (ds[i].className=="number") ds[i].onkeypress=rTN;
 		if (ds[i].className=="integer") ds[i].onkeypress=rTI;
 		if (ds[i].className=="number"){
-
-				ds[i].origonchange=ds[i].onchange;
-				ds[i].newonchange=rLocaleNumber;
-				ds[i].onchange=function(){
-					if(this.origonchange)
-						this.origonchange();
-					this.newonchange();
-				};
-
+			ds[i].origonchange=ds[i].onchange;
+			ds[i].newonchange=rLocaleNumber;
+			ds[i].onchange=function(){
+				if(this.origonchange)
+					this.origonchange();
+				this.newonchange();
+			};
 		}
 	}
 	var ds=document.getElementsByTagName("th");
@@ -357,4 +355,4 @@
 		if (ds[i].className=="ascending") ds[i].onclick=SortSelect;
 	}
 }
-window.onload=initial;
+window.onload=initial;
\ No newline at end of file