X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fview%2Fgl_trans_view.php;h=5d54c72f6210c91bc6a5138e2c3d985173b08ba4;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=32276c3a79f3f03ce2c6effcb31480084ab573c9;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/gl/view/gl_trans_view.php b/gl/view/gl_trans_view.php
index 32276c3a..5d54c72f 100644
--- a/gl/view/gl_trans_view.php
+++ b/gl/view/gl_trans_view.php
@@ -23,39 +23,36 @@ 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%");
+    start_table(TABLESTYLE, "width=95%");
     $th = array(_("General Ledger Transaction Details"), _("Reference"),
-    	_("Date"), _("Person/Item"));
-    table_header($th);	
-    start_row();	
+    	_("Date"));
+
+ 	if ($_GET['type_id'] != ST_JOURNAL)
+		$th[] = _("Counterparty");
+
+    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"]));
-	
+ 	if ($_GET['type_id'] != ST_JOURNAL)
+		label_cell(get_counterparty_name($_GET['type_id'],$_GET['trans_no']));
+
 	end_row();
 
 	comments_display_row($_GET['type_id'], $_GET['trans_no']);
 
     end_table(1);
 }
-$sql = "SELECT gl.*, cm.account_name, IF(ISNULL(refs.reference), '', refs.reference) AS reference FROM "
-	.TB_PREF."gl_trans as gl
-	LEFT JOIN ".TB_PREF."chart_master as cm ON gl.account = cm.account_code
-	LEFT JOIN ".TB_PREF."refs as refs ON (gl.type=refs.type AND gl.type_no=refs.id)"
-	." WHERE gl.type= ".db_escape($_GET['type_id']) 
-	." AND gl.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)
 {
@@ -76,24 +73,29 @@ else if ($dim == 1)
 else		
 	$th = array(_("Account Code"), _("Account Name"),
 		_("Debit"), _("Credit"), _("Memo"));
+
 $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;
-	}	
+	}
 
 	alt_table_row_color($k);
-	
-    label_cell($myrow['account']);
-	label_cell($myrow['account_name']);
+
+	$counterpartyname = get_subaccount_name($myrow["account"], $myrow["person_id"]);
+	$counterparty_id = $counterpartyname ? sprintf(' %05d', $myrow["person_id"]) : '';
+
+    label_cell($myrow['account'].$counterparty_id);
+	label_cell($myrow['account_name'] . ($counterpartyname ? ': '.$counterpartyname : ''));
 	if ($dim >= 1)
 		label_cell(get_dimension_string($myrow['dimension_id'], true));
 	if ($dim > 1)
@@ -102,14 +104,30 @@ 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'];
 }
-//end of while loop
 if ($heading_shown)
+{
+    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_table(1);
+}
+
+//end of while loop
 
 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']);
 
 ?>