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

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

diff --git a/purchasing/includes/db/supp_payment_db.inc b/purchasing/includes/db/supp_payment_db.inc
index 65b21b5a9a9a5792f7cc88c5b2319ba05676e6fe..b5adb16382ee3becd14c77ca34333d11b456d4a7 100644 (file)
--- a/purchasing/includes/db/supp_payment_db.inc
+++ b/purchasing/includes/db/supp_payment_db.inc
@@ -14,7 +14,7 @@ function write_supp_payment($trans_no, $supplier_id, $bank_account,
 {
        global $Refs;
 
-       begin_transaction();
+       begin_transaction(__FUNCTION__, func_get_args());
        $args = func_get_args(); while (count($args) < 10) $args[] = 0;
        $args = (object)array_combine(array('trans_no', 'supplier_id', 'bank_account', 'date_',
                 'ref', 'bank_amount', 'supp_amount', 'supp_discount', 'memo_', 'bank_charge'), $args);
@@ -28,26 +28,38 @@ function write_supp_payment($trans_no, $supplier_id, $bank_account,
          void_cust_allocations(ST_SUPPAYMENT, $trans_no, $date_);
        }
 
+       $bank = get_bank_account($bank_account);
+
+       if (!$bank_amount)      // auto 
+       {
+               $rate = get_exchange_rate_from_to(get_supplier_currency($supplier_id),
+                       $bank['bank_curr_code'], $date_ );
+               $bank_amount = $supp_amount/$rate;
+       }
+
+       if ($bank['bank_curr_code'] == get_company_currency()) // [0002506]
+               $rate = $bank_amount/$supp_amount;
+       else
+               $rate = 0;
+
        /* Create a supp_trans entry for the supplier payment */
        $payment_id = write_supp_trans(ST_SUPPAYMENT, 0, $supplier_id, $date_, $date_,
-               $ref, "", -$supp_amount, 0, -$supp_discount);
+               $ref, "", -$supp_amount, 0, -$supp_discount, $rate);
 
        // Now debit creditors account with payment + discount
 
        $total = 0;
     $supplier_accounts = get_supplier_accounts($supplier_id);
        $total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0,
-               $supp_amount + $supp_discount, $supplier_id);
+               $supp_amount + $supp_discount, $supplier_id, $rate);
 
        // Now credit discount received account with discounts
        if ($supp_discount != 0)
        {
                $total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payment_discount_account"], 0, 0,
-                       -$supp_discount, $supplier_id);
+                       -$supp_discount, $supplier_id, $rate);
        }
 
-       $bank = get_bank_account($bank_account);
-
        if ($bank_charge != 0)
        {
                $charge_act = get_company_pref('bank_charge_act');
@@ -56,7 +68,7 @@ function write_supp_payment($trans_no, $supplier_id, $bank_account,
        }
 
        $total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $bank['account_code'], 0, 0, '',
-               -($bank_amount + $bank_charge), $bank['bank_curr_code']);
+               -($bank_amount + $bank_charge), $bank['bank_curr_code'], PT_SUPPLIER, $supplier_id);
 
        /*Post a balance post if $total != 0 due to variance in AP and bank posted values*/
        if ($total != 0)
@@ -68,7 +80,7 @@ function write_supp_payment($trans_no, $supplier_id, $bank_account,
 
    /*now enter the bank_trans entry */
        add_bank_trans(ST_SUPPAYMENT, $payment_id, $bank_account, $ref,
-               $date_, -($bank_amount + $bank_charge), PT_SUPPLIER, $supplier_id);
+               $date_, -$bank_amount, -$bank_charge, PT_SUPPLIER, $supplier_id);
 
        add_comments(ST_SUPPAYMENT, $payment_id, $date_, $memo_);
 
@@ -86,7 +98,7 @@ function write_supp_payment($trans_no, $supplier_id, $bank_account,
 
 function void_supp_payment($type, $type_no)
 {
-       begin_transaction();
+       begin_transaction(__FUNCTION__, func_get_args());
        hook_db_prevoid($type, $type_no);
 
        void_bank_trans($type, $type_no, true);
@@ -98,4 +110,3 @@ function void_supp_payment($type, $type_no)
 }
 
 
-?>
\ No newline at end of file