X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep708.php;h=6d72454bcf6691b0108ed9cba6a7c4726e5d133b;hb=0696e813066e84e4e0bee51ebc7c46deb0367b7b;hp=cb11746c132f49eb791ceaf6b0412f59a7a694d7;hpb=d683494fb064b081b75616354993bfc889389dc2;p=fa-stable.git

diff --git a/reporting/rep708.php b/reporting/rep708.php
index cb11746c..6d72454b 100644
--- a/reporting/rep708.php
+++ b/reporting/rep708.php
@@ -91,6 +91,7 @@ function print_trial_balance()
 	$rep->Font();
 	$rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
 	$rep->Header();
+	$totprevd = $totprevc = $totcurrd = $totcurrc = 0.0;
 
 	$accounts = get_gl_accounts();
 
@@ -101,10 +102,10 @@ function print_trial_balance()
 			$begin = "";
 		else
 		{
-			if ($from < $begin)
-				$begin = add_days($from, -1);
-			else
-				$begin = add_days(begin_fiscalyear(), -1);
+			$begin = begin_fiscalyear();
+			if (date1_greater_date2($begin, $from))
+				$begin = $from;
+			$begin = add_days($begin, -1);
 		}
 
 		$prev_balance = get_gl_balance_from_to($begin, $from, $account["account_code"], $dimension, $dimension2);
@@ -113,19 +114,30 @@ function print_trial_balance()
 
 		if ($zero == 0 && !$prev_balance && !$curr_balance)
 			continue;
-
 		$rep->TextCol(0, 1, $account['account_code']);
 		$rep->TextCol(1, 2,	$account['account_name']);
 
-		if ($prev_balance > 0.0)
+		if ($prev_balance >= 0.0)
+		{
+			$totprevd += $prev_balance;
 			$rep->TextCol(2, 3,	number_format2(abs($prev_balance), $dec));
+		}	
 		else
+		{
+			$totprevc += $prev_balance;
 			$rep->TextCol(3, 4,	number_format2(abs($prev_balance), $dec));
-		if ($curr_balance > 0.0)
+		}	
+		if ($curr_balance >= 0.0)
+		{
+			$totcurrd += $curr_balance;
 			$rep->TextCol(4, 5,	number_format2(abs($curr_balance), $dec));
+		}	
 		else
+		{
+			$totcurrc += $curr_balance;
 			$rep->TextCol(5, 6,	number_format2(abs($curr_balance), $dec));
-		if ($curr_balance + $prev_balance > 0.0)
+		}	
+		if ($curr_balance + $prev_balance >= 0.0)
 			$rep->TextCol(6, 7,	number_format2(abs($curr_balance + $prev_balance), $dec));
 		else
 			$rep->TextCol(7, 8,	number_format2(abs($curr_balance + $prev_balance), $dec));
@@ -139,6 +151,36 @@ function print_trial_balance()
 		}
 	}
 	$rep->Line($rep->row);
+	$rep->NewLine();
+	$rep->Font('bold');
+	$rep->TextCol(0, 2, _("Total"));
+
+	$rep->TextCol(2, 3,	number_format2(abs($totprevd), $dec));
+	$rep->TextCol(3, 4,	number_format2(abs($totprevc), $dec));
+	$rep->TextCol(4, 5,	number_format2(abs($totcurrd), $dec));
+	$rep->TextCol(5, 6,	number_format2(abs($totcurrc), $dec));
+	$rep->TextCol(6, 7,	number_format2(abs($totcurrd + $totprevd), $dec));
+	$rep->TextCol(7, 8,	number_format2(abs($totcurrc + $totprevc), $dec));
+	$rep->NewLine();
+	$totprev = $totprevd + $totprevc;
+	$totcurr = $totcurrd + $totcurrc;
+	$rep->TextCol(0, 2, _("Ending Balance"));
+
+	if ($totprev >= 0.0)
+		$rep->TextCol(2, 3,	number_format2(abs($totprev), $dec));
+	else
+		$rep->TextCol(3, 4,	number_format2(abs($totprev), $dec));
+	if ($totcurr >= 0.0)
+		$rep->TextCol(4, 5,	number_format2(abs($totcurr), $dec));
+	else
+		$rep->TextCol(5, 6,	number_format2(abs($totcurr), $dec));
+	if ($totcurr + $totprev >= 0.0)
+		$rep->TextCol(6, 7,	number_format2(abs($totcurr + $totprev), $dec));
+	else
+		$rep->TextCol(7, 8,	number_format2(abs($totcurr + $totprev), $dec));
+	
+	$rep->Line($rep->row - 6);
+	
 	$rep->End();
 }