X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fview%2Fgl_trans_view.php;h=75ee82a3f66ff498a482c16103f08958a7652b1a;hb=52f4ea3f7360e1284b1cf1cd39b2efda6ff0606f;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..75ee82a3 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,67 @@ 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")); + $journal = $_GET['type_id'] == ST_JOURNAL; + + start_table(TABLESTYLE, "width='95%'"); + $th = array(_("General Ledger Transaction Details"), _("Reference"), + _("Transaction Date"), _("GL #")); + + if ($_GET['type_id'] == ST_JOURNAL) + array_insert($th, 3, array(_("Document Date"), _("Event Date"))); + else + array_insert($th, 3, array(_("Counterparty"))); + + if($myrow['supp_reference']) + { + array_insert($th, 2, array(_("Supplier Reference"))); + } table_header($th); start_row(); label_cell("$trans_name #" . $_GET['trans_no']); - label_cell(sql2date($myrow["tran_date"])); - label_cell(payment_person_name($myrow["person_type_id"],$myrow["person_id"])); - + label_cell($myrow["reference"], "align='center'"); + if($myrow['supp_reference']) + { + label_cell($myrow["supp_reference"], "align='center'"); + } + label_cell(sql2date($myrow["doc_date"]), "align='center'"); + if ($journal) + { + $header = get_journal($myrow['type'], $_GET['trans_no']); + label_cell($header["doc_date"] == '0000-00-00' ? '-' : sql2date($header["doc_date"]), "align='center'"); + label_cell($header["event_date"] == '0000-00-00' ? '-' : sql2date($header["event_date"]), "align='center'"); + } else + label_cell(get_counterparty_name($_GET['type_id'],$_GET['trans_no'])); + label_cell( get_journal_number($myrow['type'], $_GET['trans_no']), "align='center'"); end_row(); + start_row(); + label_cells(_('Entered By'), $myrow["real_name"], "class='tableheader2'", "colspan=" . + ($journal ? ($header['rate']==1 ? '3':'1'):'6')); + if ($journal) + { + if ($header['rate'] != 1) + label_cells(_('Exchange rate'), $header["rate"].' ', "class='tableheader2'"); + label_cells(_('Source document'), $header["source_ref"], "class='tableheader2'"); + } + 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 "