Fixed link bugs in sales order entry and optimized a couple of functions in ui_contro...

[fa-stable.git] / sales / includes / db / payment_db.inc

diff --git a/sales/includes/db/payment_db.inc b/sales/includes/db/payment_db.inc
index 12e7cc0fab833df3b19219c4fc50284a0092df10..8ae5bdf3c1d3e0f4fd7227f1f80b11c0ce2fe70f 100644 (file)
--- a/sales/includes/db/payment_db.inc
+++ b/sales/includes/db/payment_db.inc
@@ -13,7 +13,7 @@
   Write/update customer payment.
 */
 function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_account,
-       $date_, $ref, $amount, $discount, $memo_, $rate=0)
+       $date_, $ref, $amount, $discount, $memo_, $rate=0, $charge=0)
 {
        begin_transaction();
 
@@ -33,7 +33,7 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
        $total = 0;
        /* Bank account entry first */
        $total += add_gl_trans_customer(12, $payment_no, $date_,
-               $bank_gl_account, 0, 0, $amount,  $customer_id,
+               $bank_gl_account, 0, 0, $amount - $charge,  $customer_id,
                "Cannot insert a GL transaction for the bank account debit", $rate);
 
        if ($branch_id != reserved_words::get_any_numeric()) {
@@ -61,17 +61,24 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
                        "Cannot insert a GL transaction for the payment discount debit", $rate);
        }
 
+       if ($charge != 0)       {
+               /* Now Debit bank charge account with charges */
+               $charge_act = get_company_pref('bank_charge_act');
+               $total += add_gl_trans_customer(12, $payment_no, $date_,
+                       $charge_act, 0, 0, $charge, $customer_id,
+                       "Cannot insert a GL transaction for the payment bank charge debit", $rate);
+       }
        /*Post a balance post if $total != 0 */
        add_gl_balance(12, $payment_no, $date_, -$total, payment_person_types::customer(), $customer_id);       
 
        /*now enter the bank_trans entry */
        add_bank_trans(12, $payment_no, $bank_account, $ref,
-               $date_, $amount, payment_person_types::customer(), $customer_id,
+               $date_, $amount - $charge, payment_person_types::customer(), $customer_id,
                get_customer_currency($customer_id));
 
        add_comments(12, $payment_no, $date_, $memo_);
 
-       references::save_last($ref, 12);
+       references::save(12, $payment_no, $ref);
 
        commit_transaction();