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

[fa-stable.git] / purchasing / includes / db / supp_trans_db.inc

diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index 618ddeeb1f82f8e2fe2ae140916618bc26ca4c87..4a76ed11b61fec8d818c647cfa1fd5168c10dd9e 100644 (file)
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -14,7 +14,7 @@
 //     FIXME - this should be revised for transaction update case.
 //
 function write_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $reference, $supp_reference,
-       $amount, $amount_tax, $discount, $err_msg="", $rate=0, $included=0)
+       $amount, $amount_tax, $discount, $rate=0, $included=0)
 {
        $new = $trans_no==0;
        $date = date2sql($date_);
@@ -39,10 +39,7 @@ function write_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $re
                ".db_escape($reference).", ".db_escape($supp_reference).", ".db_escape($amount)
                .", ".db_escape($amount_tax).", ".db_escape($rate).", ".db_escape($discount).", ".db_escape($included).")";
 
-       if ($err_msg == "")
-               $err_msg = "Cannot insert a supplier transaction record";
-
-       db_query($sql, $err_msg);
+       db_query($sql, "Cannot insert a supplier transaction record");
        add_audit_trail($type, $trans_no, $date_);
 
        return $trans_no;
@@ -72,7 +69,7 @@ function get_supp_trans($trans_no, $trans_type=-1, $supplier_id=null)
        {
                // it's a payment so also get the bank account
                $sql .= ", account.bank_name, account.bank_account_name, account.bank_curr_code,
-                       account.account_type AS BankTransType, bank_trans.amount AS bank_amount,
+                       account.account_type AS BankTransType, bank_trans.amount AS bank_amount, bank_trans.charge AS bank_charge,
                        bank_trans.ref ";
        }