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

[svn at linuxrulz.org]

Author: nkukard
Date: 2008-11-09 12:36:00 +0000 (Sun, 09 Nov 2008)
New Revision: 261

Modified:
   trunk/wiaflos/server/Reporting.pm
Log:
* Made balance brought forward optional for reports


Modified: trunk/wiaflos/server/Reporting.pm
===================================================================
--- trunk/wiaflos/server/Reporting.pm	2008-11-09 05:43:19 UTC (rev 260)
+++ trunk/wiaflos/server/Reporting.pm	2008-11-09 12:36:00 UTC (rev 261)
@@ -154,7 +154,7 @@
 				$creditBalance->badd($caccount->{'CreditBalance'});
 				$debitBalance->badd($caccount->{'DebitBalance'});
 				# Check if we should add up opening balances
-				if ($flags && REPORT_BALANCE_BF == REPORT_BALANCE_BF) {
+				if (($flags & REPORT_BALANCE_BF) == REPORT_BALANCE_BF) {
 					$openingCreditBalance->badd($caccount->{'OpeningCreditBalance'});
 					$openingDebitBalance->badd($caccount->{'OpeningDebitBalance'});
 				}
@@ -181,7 +181,7 @@
 			$paccount->{'Balance'} = $balance->bstr();
 
 			# Check if we need to pull in balance brought forward
-			if ($flags & REPORT_BALANCE_BF == REPORT_BALANCE_BF) {
+			if (($flags & REPORT_BALANCE_BF) == REPORT_BALANCE_BF) {
 				# We can only do this if we have a start date, else its pointless?
 				if ($search->{'StartDate'}) {
 					my $bfinfo;
@@ -252,12 +252,20 @@
 	# Reporting API function to retrieve account balances
 	sub api_account_balances
 	{
+		our $flags = shift;
+
+
+		# Set flags to 0 if we don't have any
+		if (!defined($flags) || $flags eq "") {
+			$flags = 0;
+		}
+
 		# GL search criteria
 		my $search;
 		$search->{'StartDate'} = $detail->{'StartDate'};
 		$search->{'EndDate'} = $detail->{'EndDate'};
 		
-		my $entries = getAccountBalances(REPORT_BALANCE_BF,$search);
+		my $entries = getAccountBalances($flags,$search);
 		if (ref($entries) ne "ARRAY") {
 			wiaflos::server::templating::abort('api_account_balances',$entries);
 		}
@@ -290,11 +298,13 @@
 				$i->{'CreditBalance'} = $account->{'CreditBalance'};
 				$i->{'Balance'} = $account->{'Balance'};
 				# Check if we need the opening balances
-				$i->{'OpeningDebitBalance'} = $account->{'OpeningDebitBalance'};
-				$i->{'OpeningCreditBalance'} = $account->{'OpeningCreditBalance'};
-				$i->{'OpeningBalance'} = $account->{'OpeningBalance'};
-				# And closing balance
-				$i->{'ClosingBalance'} = $account->{'ClosingBalance'};
+				if (($flags & REPORT_BALANCE_BF) == REPORT_BALANCE_BF) {
+					$i->{'OpeningDebitBalance'} = $account->{'OpeningDebitBalance'};
+					$i->{'OpeningCreditBalance'} = $account->{'OpeningCreditBalance'};
+					$i->{'OpeningBalance'} = $account->{'OpeningBalance'};
+					# And closing balance
+					$i->{'ClosingBalance'} = $account->{'ClosingBalance'};
+				}
 	
 				# Check balance
 				my $balance = Math::BigFloat->new();
@@ -585,7 +595,6 @@
 		} else {
 			wiaflos::server::templating::abort('api_variable_get','Variable not defined: "'.defined($item) ? $item : ''.'"');
 		}
-print(STDERR "Get: $item => $res\n");
 		return $res;
 	}
 
@@ -670,6 +679,8 @@
 
 		# API
 		'api_account_balances' => \&api_account_balances,
+		'API_RPT_BALANCE_BF' => REPORT_BALANCE_BF,
+
 		'api_account_entries' => \&api_account_entries,
 		'api_inventory_stock_balances' => \&api_inventory_stock_balances,