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 c9a455f1d614645da9c24bd791175db7021ce94c..cfd796a7dd9ec4666b931ad843263b46228c8a51 100644 (file)
--- a/purchasing/view/view_supp_payment.php
+++ b/purchasing/view/view_supp_payment.php
@@ -50,34 +50,24 @@ echo "<br>";
 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'");
-end_row();
-start_row();
-if ($show_currencies)
-       label_cells(_("Payment Currency"), $receipt['bank_curr_code'], "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'");
-if ($receipt['ov_discount'] != 0)
-       label_cells(_("Discount"), number_format2(-$receipt['ov_discount']*$receipt['rate'], user_price_dec()), "class='tableheader2'");
-else
-       label_cells(_("Payment Type"), $bank_transfer_types[$receipt['BankTransType']], "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(_("Supplier's Currency"), $receipt['curr_code'], "class='tableheader2'");
-}
-if ($show_both_amounts)
-       label_cells(_("Amount"), number_format2(-$receipt['Total'], user_price_dec()), "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();
-if ($receipt['ov_discount'] != 0)
-{
-       start_row();
-       label_cells(_("Payment Type"), $bank_transfer_types[$receipt['BankTransType']], "class='tableheader2'");
-       end_row();
-}
+
+start_row();
+       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(ST_SUPPAYMENT, $trans_no);
 
 end_table(1);