X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fview%2Fgl_deposit_view.php;h=949282b5699b717060da0ac729ffa613418de734;hb=2b57e354f43e55afc49a4c776fa7023f58c99a62;hp=04232dd7cc4df1ffa54154afe5aad36d83e40a1e;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git diff --git a/gl/view/gl_deposit_view.php b/gl/view/gl_deposit_view.php index 04232dd7..949282b5 100644 --- a/gl/view/gl_deposit_view.php +++ b/gl/view/gl_deposit_view.php @@ -14,7 +14,7 @@ $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("View Bank Deposit"), true); +page(_($help_context = "View Bank Deposit"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -48,7 +48,7 @@ echo "
"; display_heading(_("GL Deposit") . " #$trans_no"); echo "
"; -start_table("$table_style width=80%"); +start_table(TABLESTYLE, "width=80%"); if ($show_currencies) { @@ -93,9 +93,17 @@ else if ($show_currencies) display_heading2(_("Item Amounts are Shown in :") . " " . $company_currency); - start_table("$table_style width=80%"); - $th = array(_("Account Code"), _("Account Description"), - _("Amount"), _("Memo")); + start_table(TABLESTYLE, "width=80%"); + $dim = get_company_pref('use_dimension'); + if ($dim == 2) + $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1", _("Dimension")." 2", + _("Amount"), _("Memo")); + else if ($dim == 1) + $th = array(_("Account Code"), _("Account Description"), _("Dimension"), + _("Amount"), _("Memo")); + else + $th = array(_("Account Code"), _("Account Description"), + _("Amount"), _("Memo")); table_header($th); $k = 0; //row colour counter @@ -110,19 +118,23 @@ else label_cell($item["account"]); label_cell($item["account_name"]); - amount_cell(abs($item["amount"])); + if ($dim >= 1) + label_cell(get_dimension_string($item['dimension_id'], true)); + if ($dim > 1) + label_cell(get_dimension_string($item['dimension2_id'], true)); + amount_cell($item["amount"]); label_cell($item["memo_"]); end_row(); - $total_amount += abs($item["amount"]); + $total_amount += $item["amount"]; } } - label_row(_("Total"), number_format2($total_amount, user_price_dec()),"colspan=2 align=right", "align=right"); + label_row(_("Total"), number_format2($total_amount, user_price_dec()),"colspan=".(2+$dim)." align=right", "align=right"); end_table(1); display_allocations_from($to_trans['person_type_id'], $to_trans['person_id'], 2, $trans_no, $to_trans['amount']); } -end_page(true); +end_page(true, false, false, ST_BANKDEPOSIT, $trans_no); ?> \ No newline at end of file