X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=818fd1b5de94e3ac3ec9bd7a2f20990be402c942;hb=884c36eec7dbaae89e1f5532cc2c2f8033b010fd;hp=50ff2e3dead16a02e12f2ab774ec2a92db3bf707;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git

diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 50ff2e3d..818fd1b5 100644
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -37,12 +37,17 @@ if (get_post('Show'))
 
 function gl_inquiry_controls()
 {
+	$dim = get_company_pref('use_dimension');
     start_form();
 
-    start_table("class='tablestyle_noborder'");
+    start_table(TABLESTYLE_NOBORDER);
 
     date_cells(_("From:"), 'TransFromDate', '', null, -30);
 	date_cells(_("To:"), 'TransToDate');
+	if ($dim >= 1)
+		dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1);
+	if ($dim > 1)
+		dimensions_list_cells(_("Dimension")." 2:", 'Dimension2', null, true, " ", false, 2);
 	check_cells(_("No zero values"), 'NoZero', null);
 	check_cells(_("Only balances"), 'Balance', null);
 
@@ -55,10 +60,14 @@ function gl_inquiry_controls()
 
 function display_trial_balance()
 {
-	global $table_style, $path_to_root;
+	global $path_to_root;
 
 	div_start('balance_tbl');
-	start_table($table_style);
+	if (!isset($_POST['Dimension']))
+		$_POST['Dimension'] = 0;
+	if (!isset($_POST['Dimension2']))
+		$_POST['Dimension2'] = 0;
+	start_table(TABLESTYLE);
 	$tableheader =  "<tr>
         <td rowspan=2 class='tableheader'>" . _("Account") . "</td>
         <td rowspan=2 class='tableheader'>" . _("Account Name") . "</td>
@@ -87,14 +96,14 @@ function display_trial_balance()
 	
 	while ($account = db_fetch($accounts))
 	{
-		$prev = get_balance($account["account_code"], 0, 0, $begin, $_POST['TransFromDate'], false, false);
-		$curr = get_balance($account["account_code"], 0, 0, $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
-		$tot = get_balance($account["account_code"], 0, 0, $begin, $_POST['TransToDate'], false, true);
+		$prev = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $_POST['TransFromDate'], false, false);
+		$curr = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
+		$tot = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $_POST['TransToDate'], false, true);
 		if (check_value("NoZero") && !$prev['balance'] && !$curr['balance'] && !$tot['balance'])
 			continue;
 		alt_table_row_color($k);
 
-		$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>";
+		$url = "<a href='$path_to_root/gl/inquiry/gl_account_inquiry.php?TransFromDate=" . $_POST["TransFromDate"] . "&TransToDate=" . $_POST["TransToDate"] . "&account=" . $account["account_code"] . "&Dimension=" . $_POST["Dimension"] . "&Dimension2=" . $_POST["Dimension2"] . "'>" . $account["account_code"] . "</a>";
 
 		label_cell($url);
 		label_cell($account["account_name"]);