X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fview%2Fgl_payment_view.php;h=25f9668bae12f804765dcc09a6afe8df569f6a06;hb=630e99edecc3eabe708a9e7bda94eaa60bf16db7;hp=739ffa9888753d177156031696fb1e19166b0967;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git diff --git a/gl/view/gl_payment_view.php b/gl/view/gl_payment_view.php index 739ffa98..25f9668b 100644 --- a/gl/view/gl_payment_view.php +++ b/gl/view/gl_payment_view.php @@ -1,20 +1,20 @@ . + See the License here . ***********************************************************************/ -$page_security = 1; -$path_to_root="../.."; +$page_security = 'SA_BANKTRANSVIEW'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("View Bank Payment"), true); +page(_($help_context = "View Bank Payment"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -27,7 +27,7 @@ if (isset($_GET["trans_no"])) } // get the pay-from bank payment info -$result = get_bank_trans(systypes::bank_payment(), $trans_no); +$result = get_bank_trans(ST_BANKPAYMENT, $trans_no); if (db_num_rows($result) != 1) display_db_error("duplicate payment bank transaction found", ""); @@ -38,7 +38,7 @@ $company_currency = get_company_currency(); $show_currencies = false; -if ($from_trans['bank_curr_code'] != $company_currency) +if ($from_trans['bank_curr_code'] != $from_trans['settle_curr']) { $show_currencies = true; } @@ -46,17 +46,17 @@ if ($from_trans['bank_curr_code'] != $company_currency) display_heading(_("GL Payment") . " #$trans_no"); echo "
"; -start_table("$table_style width=80%"); +start_table(TABLESTYLE, "width='80%'"); if ($show_currencies) { - $colspan1 = 5; - $colspan2 = 8; + $colspan1 = 1; + $colspan2 = 7; } else { $colspan1 = 3; - $colspan2 = 6; + $colspan2 = 5; } start_row(); label_cells(_("From Bank Account"), $from_trans['bank_account_name'], "class='tableheader2'"); @@ -66,19 +66,24 @@ label_cells(_("Amount"), number_format2(-$from_trans['amount'], user_price_dec() label_cells(_("Date"), sql2date($from_trans['trans_date']), "class='tableheader2'"); end_row(); start_row(); -label_cells(_("Pay To"), payment_person_types::person_name($from_trans['person_type_id'], $from_trans['person_id']), "class='tableheader2'", "colspan=$colspan1"); -label_cells(_("Payment Type"),bank_account_types::transfer_type($from_trans['account_type']), "class='tableheader2'"); +label_cells(_("Pay To"), get_counterparty_name(ST_BANKPAYMENT, $from_trans['trans_no']), "class='tableheader2'", "colspan=$colspan1"); +if ($show_currencies) +{ + label_cells(_("Settle currency"), $from_trans['settle_curr'], "class='tableheader2'"); + label_cells(_("Settled amount"), number_format2($from_trans['settled_amount'], user_price_dec()), "class='tableheader2'"); +} +label_cells(_("Payment Type"), $bank_transfer_types[$from_trans['account_type']], "class='tableheader2'"); end_row(); start_row(); label_cells(_("Reference"), $from_trans['ref'], "class='tableheader2'", "colspan=$colspan2"); end_row(); -comments_display_row(systypes::bank_payment(), $trans_no); +comments_display_row(ST_BANKPAYMENT, $trans_no); end_table(1); -$voided = is_voided_display(systypes::bank_payment(), $trans_no, _("This payment has been voided.")); +$voided = is_voided_display(ST_BANKPAYMENT, $trans_no, _("This payment has been voided.")); -$items = get_gl_trans(systypes::bank_payment(), $trans_no); +$items = get_gl_trans(ST_BANKPAYMENT, $trans_no); if (db_num_rows($items)==0) { @@ -89,16 +94,24 @@ else display_heading2(_("Items for this Payment")); if ($show_currencies) - display_heading2(_("Item Amounts are Shown in :") . " " . $company_currency); + display_heading2(_("Item Amounts are Shown in:") . " " . $company_currency); echo "
"; - 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")); + elseif ($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 - $totalAmount = 0; + $total_amount = 0; while ($item = db_fetch($items)) { @@ -109,20 +122,23 @@ else label_cell($item["account"]); label_cell($item["account_name"]); + 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(); - $totalAmount += $item["amount"]; + $total_amount += $item["amount"]; } } - label_row(_("Total"), number_format2($totalAmount, 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); if (!$voided) - display_allocations_from($from_trans['person_type_id'], $from_trans['person_id'], 1, $trans_no, -$from_trans['amount']); + display_allocations_from($from_trans['person_type_id'], $from_trans['person_id'], 1, $trans_no, $from_trans['settled_amount']); } -end_page(true); -?> \ No newline at end of file +end_page(true, false, false, ST_BANKPAYMENT, $trans_no);