Added missing field for bank charges in bank_trans, rewritten bank transaction views...

[fa-stable.git] / purchasing / view / view_supp_payment.php

diff --git a/purchasing/view/view_supp_payment.php b/purchasing/view/view_supp_payment.php
index c7da2a5669f7c7fa7679e331d18711e9365b7156..cfd796a7dd9ec4666b931ad843263b46228c8a51 100644 (file)
--- a/purchasing/view/view_supp_payment.php
+++ b/purchasing/view/view_supp_payment.php
@@ -17,26 +17,26 @@ include($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 500);
-page(_("View Payment to Supplier"), true, false, "", $js);
+page(_($help_context = "View Payment to Supplier"), true, false, "", $js);
 
 if (isset($_GET["trans_no"]))
 {
        $trans_no = $_GET["trans_no"];
 }
 
-$receipt = get_supp_trans($trans_no, 22);
+$receipt = get_supp_trans($trans_no, ST_SUPPAYMENT);
 
 $company_currency = get_company_currency();
 
 $show_currencies = false;
 $show_both_amounts = false;
 
-if (($receipt['bank_curr_code'] != $company_currency) || ($receipt['SupplierCurrCode'] != $company_currency))
+if (($receipt['bank_curr_code'] != $company_currency) || ($receipt['curr_code'] != $company_currency))
        $show_currencies = true;
 
-if ($receipt['bank_curr_code'] != $receipt['SupplierCurrCode']) 
+if ($receipt['bank_curr_code'] != $receipt['curr_code']) 
 {
        $show_currencies = true;
        $show_both_amounts = true;
@@ -47,39 +47,37 @@ echo "<center>";
 display_heading(_("Payment to Supplier") . " #$trans_no");
 
 echo "<br>";
-start_table("$table_style2 width=80%");
+start_table(TABLESTYLE2, "width='80%'");
 
 start_row();
-label_cells(_("To Supplier"), $receipt['supplier_name'], "class='tableheader2'");
-label_cells(_("From Bank Account"), $receipt['bank_account_name'], "class='tableheader2'");
-label_cells(_("Date Paid"), sql2date($receipt['tran_date']), "class='tableheader2'");
+$act = $show_currencies ? $receipt['bank_account_name'].' '.$receipt['bank_curr_code'] : $receipt['bank_account_name'];
+label_cells(_("From Bank Account"), $act, "class='tableheader2'");
+label_cells(_("Amount"), number_format2(-$receipt['bank_amount'], user_price_dec()), "class='tableheader2'");
+label_cells(_("Bank Fee"), number_format2(-$receipt['bank_charge'], user_price_dec()), "class='tableheader2'");
 end_row();
+
 start_row();
-if ($show_currencies)
-       label_cells(_("Payment Currency"), $receipt['bank_curr_code'], "class='tableheader2'");
-label_cells(_("Amount"), number_format2(-$receipt['BankAmount'], user_price_dec()), "class='tableheader2'");
-label_cells(_("Payment Type"), bank_account_types::transfer_type($receipt['BankTransType']), "class='tableheader2'");
+$supp = $show_currencies ? $receipt['supplier_name'].' '.$receipt['curr_code'] : $receipt['supplier_name'];
+label_cells(_("To Supplier"), $supp, "class='tableheader2'");
+label_cells(_("Reference"), $receipt['ref'], "class='tableheader2'");
+label_cells(_("Date Paid"), sql2date($receipt['tran_date']), "class='tableheader2'");
 end_row();
+
 start_row();
-if ($show_currencies) 
-{
-       label_cells(_("Supplier's Currency"), $receipt['SupplierCurrCode'], "class='tableheader2'");
-}
-if ($show_both_amounts)
-       label_cells(_("Amount"), number_format2(-$receipt['Total'], user_price_dec()), "class='tableheader2'");
-label_cells(_("Reference"), $receipt['ref'], "class='tableheader2'");
+       label_cells(_("Discount"), number_format2(-$receipt['ov_discount']*$receipt['rate'], user_price_dec()), "class='tableheader2'");
+       label_cells(_("Tottal settled"), number_format2(-$receipt['Total'], user_price_dec()), "class='tableheader2'");
 end_row();
-comments_display_row(22, $trans_no);
+
+comments_display_row(ST_SUPPAYMENT, $trans_no);
 
 end_table(1);
 
-$voided = is_voided_display(22, $trans_no, _("This payment has been voided."));
+$voided = is_voided_display(ST_SUPPAYMENT, $trans_no, _("This payment has been voided."));
 
 // now display the allocations for this payment
 if (!$voided) 
 {
-       display_allocations_from(payment_person_types::supplier(), $receipt['supplier_id'], 22, $trans_no, -$receipt['Total']);
+       display_allocations_from(PT_SUPPLIER, $receipt['supplier_id'], ST_SUPPAYMENT, $trans_no, -$receipt['Total']);
 }
 
-end_page(true);
-?>
\ No newline at end of file
+end_page(true, false, false, ST_SUPPAYMENT, $trans_no);