X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fview%2Fgl_trans_view.php;h=70103026da85967d4ee3d66bc936a566ac9b4920;hb=401037106904dd742e13f7762d3e346042357c6e;hp=64e585a5a16b8f2530bfa84d9f0cc3d028b0dc26;hpb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;p=fa-stable.git

diff --git a/gl/view/gl_trans_view.php b/gl/view/gl_trans_view.php
index 64e585a5..70103026 100644
--- a/gl/view/gl_trans_view.php
+++ b/gl/view/gl_trans_view.php
@@ -13,7 +13,7 @@ $page_security = 'SA_GLTRANSVIEW';
 $path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("General Ledger Transaction Details"), true);
+page(_($help_context = "General Ledger Transaction Details"), true);
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
@@ -23,20 +23,21 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 if (!isset($_GET['type_id']) || !isset($_GET['trans_no'])) 
 { /*Script was not passed the correct parameters */
 
-	echo "<p>" . _("The script must be called with a valid transaction type and transaction number to review the general ledger postings for.") . "</p>";
-	exit;
+	display_note(_("The script must be called with a valid transaction type and transaction number to review the general ledger postings for."));
+	end_page();
 }
 
 function display_gl_heading($myrow)
 {
-	global $table_style, $systypes_array;
+	global $systypes_array;
 	$trans_name = $systypes_array[$_GET['type_id']];
-    start_table("$table_style width=95%");
-    $th = array(_("General Ledger Transaction Details"),
+    start_table(TABLESTYLE, "width=95%");
+    $th = array(_("General Ledger Transaction Details"), _("Reference"),
     	_("Date"), _("Person/Item"));
     table_header($th);	
     start_row();	
     label_cell("$trans_name #" . $_GET['trans_no']);
+    label_cell($myrow["reference"]);
 	label_cell(sql2date($myrow["tran_date"]));
 	label_cell(payment_person_name($myrow["person_type_id"],$myrow["person_id"]));
 	
@@ -46,14 +47,7 @@ function display_gl_heading($myrow)
 
     end_table(1);
 }
-
-$sql = "SELECT ".TB_PREF."gl_trans.*, account_name FROM "
-	.TB_PREF."gl_trans, ".TB_PREF."chart_master WHERE "
-	.TB_PREF."gl_trans.account = ".TB_PREF."chart_master.account_code AND type= " 
-	.db_escape($_GET['type_id']) . " AND type_no = ".db_escape($_GET['trans_no']) 
-	. " ORDER BY counter";
-$result = db_query($sql,"could not get transactions");
-//alert("sql = ".$sql);
+$result = get_gl_trans($_GET['type_id'], $_GET['trans_no']);
 
 if (db_num_rows($result) == 0)
 {
@@ -77,13 +71,14 @@ else
 $k = 0; //row colour counter
 $heading_shown = false;
 
+$credit = $debit = 0;
 while ($myrow = db_fetch($result)) 
 {
 	if ($myrow['amount'] == 0) continue;
 	if (!$heading_shown)
 	{
 		display_gl_heading($myrow);
-		start_table("$table_style width=95%");
+		start_table(TABLESTYLE, "width=95%");
 		table_header($th);
 		$heading_shown = true;
 	}	
@@ -100,14 +95,28 @@ while ($myrow = db_fetch($result))
 	display_debit_or_credit_cells($myrow['amount']);
 	label_cell($myrow['memo_']);
 	end_row();
-
+    if ($myrow['amount'] > 0 ) 
+    	$debit += $myrow['amount'];
+    else 
+    	$credit += $myrow['amount'];
 }
+start_row("class='inquirybg' style='font-weight:bold'");
+label_cell(_("Total"), "colspan=2");
+if ($dim >= 1)
+    label_cell('');
+if ($dim > 1)
+    label_cell('');
+amount_cell($debit);
+amount_cell(-$credit);
+label_cell('');
+end_row();
+
 //end of while loop
 if ($heading_shown)
 	end_table(1);
 
 is_voided_display($_GET['type_id'], $_GET['trans_no'], _("This transaction has been voided."));
 
-end_page(true);
+end_page(true, false, false, $_GET['type_id'], $_GET['trans_no']);
 
 ?>