X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fview%2Fgl_trans_view.php;h=5d54c72f6210c91bc6a5138e2c3d985173b08ba4;hb=f1fe277df787cdefb65142d66ce247b8757ba057;hp=c48ed8199fe1df999846657a7e491a11993df356;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git diff --git a/gl/view/gl_trans_view.php b/gl/view/gl_trans_view.php index c48ed819..5d54c72f 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,37 +23,40 @@ 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 "
" . _("The script must be called with a valid transaction type and transaction number to review the general ledger postings for.") . "
"; - 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"), - _("Date"), _("Person/Item")); - table_header($th); - start_row(); + start_table(TABLESTYLE, "width=95%"); + $th = array(_("General Ledger Transaction Details"), _("Reference"), + _("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 ".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= " . $_GET['type_id'] . " AND type_no = " . $_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) { - echo "