[wiaflos-devel] COMMIT - r254 - trunk/wiaflos/server

[svn at linuxrulz.org]

Author: nkukard
Date: 2008-11-08 16:41:50 +0000 (Sat, 08 Nov 2008)
New Revision: 254

Modified:
   trunk/wiaflos/server/GL.pm
Log:
* Added ability to getAccountBalances to exclude end date


Modified: trunk/wiaflos/server/GL.pm
===================================================================
--- trunk/wiaflos/server/GL.pm	2008-11-08 06:37:33 UTC (rev 253)
+++ trunk/wiaflos/server/GL.pm	2008-11-08 16:41:50 UTC (rev 254)
@@ -1071,7 +1071,7 @@
 # @li AccountNumber Optional account number
 # @li StartDate	Optional start date
 # @li EndDate Optional end date
-# @li BalanceBroughtForward Optional flag to indicate if we must generate a balance brought forward entry
+# @li BalanceBroughtForward Optional flag to indicate if we must generate a balance brought forward entry, 'y[es]|1'
 #
 # @returns Array ref of hash refs
 # @li ID GL entry ID
@@ -1218,6 +1218,7 @@
 # @li AccountNumber - Optional account number
 # @li StartDate	- Optional start date
 # @li EndDate - Optional end date
+# @li EndDateExcl - Exclude end date from search, 'y[es]|1'
 #
 # @returns Hash of account balances
 # @li CreditBalance - Credit balance
@@ -1261,7 +1262,11 @@
 
 	# Check if we must use an end date
 	if (defined($data->{'EndDate'}) && $data->{'EndDate'} ne "") {
-		$extraSQL .= " AND gl_transactions.TransactionDate <= ".DBQuote($data->{'EndDate'});
+		if (defined($data->{'EndDateExcl'}) && ( $data->{'EndDateExcl'} =~ /^y(?:es)?$/i || $data->{'EndDateExcl'} eq "1" )) {
+			$extraSQL .= " AND gl_transactions.TransactionDate < ".DBQuote($data->{'EndDate'});
+		} else {
+			$extraSQL .= " AND gl_transactions.TransactionDate <= ".DBQuote($data->{'EndDate'});
+		}
 	}
 
 	# Return list of transaction entries