X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=093307c945cdc8e07c961b75cc0c3cf8afd792ba;hb=e8ae3516539a520338117f25d401c0fc234973a4;hp=969cfcca0dd6c8030c6877e3afe950de87456d16;hpb=66626dafdf0a397406e36663f3ed15321d09984a;p=fa-stable.git

diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 969cfcca..093307c9 100644
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 8;
 $path_to_root="../..";
 
@@ -35,6 +44,7 @@ function gl_inquiry_controls()
     date_cells(_("From:"), 'TransFromDate', '', null, -30);
 	date_cells(_("To:"), 'TransToDate');
 	check_cells(_("No zero values"), 'NoZero', null);
+	check_cells(_("Only balances"), 'Balance', null);
 
 	submit_cells('Show',_("Show"),'','', true);
     end_table();
@@ -43,33 +53,29 @@ function gl_inquiry_controls()
 
 //----------------------------------------------------------------------------------------------------
 
-function get_balance($account, $from, $to, $from_incl=true, $to_incl=true) {
-
-	$sql = "SELECT SUM(amount) As TransactionSum FROM ".TB_PREF."gl_trans
-		WHERE account='$account'";
-
-	if ($from)
-	{
-		$from_date = date2sql($from);
-		if ($from_incl)
-			$sql .= " AND tran_date >= '$from_date'";
-		else
-			$sql .= " AND tran_date > '$from_date'";
-	}
-
-	if ($to)
-	{
-		$to_date = date2sql($to);
-		if ($to_incl)
-			$sql .= " AND tran_date <= '$to_date' ";
-		else
-			$sql .= " AND tran_date < '$to_date' ";
-	}
+function get_balance($account, $from, $to, $from_incl=true, $to_incl=true) 
+{
+	$sql = "SELECT SUM(IF(amount >= 0, amount, 0)) AS debit, SUM(IF(amount < 0, -amount, 0)) AS credit, SUM(amount) AS balance 
+		FROM ".TB_PREF."gl_trans,".TB_PREF."chart_master,".TB_PREF."chart_types, ".TB_PREF."chart_class 
+		WHERE ".TB_PREF."gl_trans.account=".TB_PREF."chart_master.account_code AND ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id 
+		AND ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid AND";
+		
+	if ($account != null)
+		$sql .= " account='$account' AND";
+	$from_date = date2sql($from);
+	if ($from_incl)
+		$sql .= " tran_date >= '$from_date'  AND";
+	else
+		$sql .= " tran_date > IF(".TB_PREF."chart_class.balance_sheet=1, '0000-00-00', '$from_date') AND";
+	$to_date = date2sql($to);
+	if ($to_incl)
+		$sql .= " tran_date <= '$to_date' ";
+	else
+		$sql .= " tran_date < '$to_date' ";
 
 	$result = db_query($sql,"No general ledger accounts were returned");
 
-	$row = db_fetch_row($result);
-	return $row[0];
+	return db_fetch($result);
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -99,44 +105,74 @@ function display_trial_balance()
 
 	$k = 0;
 
-	$totprev = $totcurr = 0.0;
 	$accounts = get_gl_accounts();
-
+	$pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0;
+	$begin = begin_fiscalyear();
+	if (date1_greater_date2($begin, $_POST['TransFromDate']))
+		$begin = $_POST['TransFromDate'];
+	$begin = add_days($begin, -1);
+	
 	while ($account = db_fetch($accounts))
 	{
-		if (is_account_balancesheet($account["account_code"]))
-			$begin = null;
-		else
-		{
-			$begin = begin_fiscalyear();
-			if (date1_greater_date2($begin, $_POST['TransFromDate']))
-				$begin = $_POST['TransFromDate'];
-			$begin = add_days($begin, -1);
-		}
-		$prev_balance = get_balance($account["account_code"], $begin, $_POST['TransFromDate'], false, false);
-
-		$curr_balance = get_balance($account["account_code"], $_POST['TransFromDate'], $_POST['TransToDate']);
-		if (check_value("NoZero") && !$prev_balance && !$curr_balance)
+		$prev = get_balance($account["account_code"], $begin, $_POST['TransFromDate'], false, false);
+		$curr = get_balance($account["account_code"], $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
+		$tot = get_balance($account["account_code"], $begin, $_POST['TransToDate'], false, true);
+		if (check_value("NoZero") && !$prev['balance'] && !$curr['balance'] && !$tot['balance'])
 			continue;
-		$totprev += $prev_balance;
-		$totcurr += $curr_balance;
 		alt_table_row_color($k);
 
-		$url = "<a href='$path_to_root/gl/inquiry/gl_account_inquiry.php?" . SID . "TransFromDate=" . $_POST["TransFromDate"] . "&TransToDate=" . $_POST["TransToDate"] . "&account=" . $account["account_code"] . "'>" . $account["account_code"] . "</a>";
+		$url = "<a href='$path_to_root/gl/inquiry/gl_account_inquiry.php?TransFromDate=" . $_POST["TransFromDate"] . "&TransToDate=" . $_POST["TransToDate"] . "&account=" . $account["account_code"] . "'>" . $account["account_code"] . "</a>";
 
 		label_cell($url);
 		label_cell($account["account_name"]);
-
-		display_debit_or_credit_cells($prev_balance);
-		display_debit_or_credit_cells($curr_balance);
-		display_debit_or_credit_cells($prev_balance + $curr_balance);
+		if (check_value('Balance'))
+		{
+			display_debit_or_credit_cells($prev['balance']);
+			display_debit_or_credit_cells($curr['balance']);
+			display_debit_or_credit_cells($tot['balance']);
+			
+		}
+		else
+		{
+			amount_cell($prev['debit']);
+			amount_cell($prev['credit']);
+			amount_cell($curr['debit']);
+			amount_cell($curr['credit']);
+			amount_cell($tot['debit']);
+			amount_cell($tot['credit']);
+			$pdeb += $prev['debit'];
+			$pcre += $prev['credit'];
+			$cdeb += $curr['debit'];
+			$ccre += $curr['credit'];
+			$tdeb += $tot['debit'];
+			$tcre += $tot['credit'];
+		}	
+		$pbal += $prev['balance'];
+		$cbal += $curr['balance'];
+		$tbal += $tot['balance'];
 		end_row();
 	}
-	start_row("class='inquirybg'");
-	label_cell("<b>" . _("Ending Balance") ." - ".$_POST['TransToDate']. "</b>", "colspan=2");
-	display_debit_or_credit_cells($totprev);
-	display_debit_or_credit_cells($totcurr);
-	display_debit_or_credit_cells($totprev + $totcurr);
+
+	//$prev = get_balance(null, $begin, $_POST['TransFromDate'], false, false);
+	//$curr = get_balance(null, $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
+	//$tot = get_balance(null, $begin, $_POST['TransToDate'], false, true);
+	if (!check_value('Balance'))
+	{
+		start_row("class='inquirybg' style='font-weight:bold'");
+		label_cell(_("Total") ." - ".$_POST['TransToDate'], "colspan=2");
+		amount_cell($pdeb);
+		amount_cell($pcre);
+		amount_cell($cdeb);
+		amount_cell($ccre);
+		amount_cell($tdeb);
+		amount_cell($tcre);
+		end_row();
+	}	
+	start_row("class='inquirybg' style='font-weight:bold'");
+	label_cell(_("Ending Balance") ." - ".$_POST['TransToDate'], "colspan=2");
+	display_debit_or_credit_cells($pbal);
+	display_debit_or_credit_cells($cbal);
+	display_debit_or_credit_cells($tbal);
 	end_row();
 
 	end_table(1);