0001503: Request - fee account included in bank account table

[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 2f9e5ac2a44242495686709f47529b1c82bcc3f6..baabf0fed5623c83f2fe7ec010981226ba25d745 100644 (file)
--- a/sales/includes/db/payment_db.inc
+++ b/sales/includes/db/payment_db.inc
@@ -18,20 +18,27 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
        global $Refs;
 
        begin_transaction();
+       $args = func_get_args(); while (count($args) < 11) $args[] = 0;
+       $args = (object)array_combine(array('trans_no', 'customer_id', 'branch_id', 'bank_account', 
+               'date_', 'ref', 'amount', 'discount', 'memo_','rate','charge'), $args);
+       hook_db_prewrite($args, ST_CUSTPAYMENT);
 
        $company_record = get_company_prefs();
-
-       $payment_no = write_customer_trans(ST_CUSTPAYMENT, $trans_no, $customer_id, $branch_id, 
-               $date_, $ref, $amount, $discount, 0, 0, 0, 0, 0, 0, "", 0, $rate);
-
-       $bank_gl_account = get_bank_gl_account($bank_account);
-
+       
+       //Chaitanya : 13_OCT_2011 : Voiding Tasks first
+       //Reason : After modifying the customer trans, it was getting voided later
        if ($trans_no != 0) {
          delete_comments(ST_CUSTPAYMENT, $trans_no);
          void_bank_trans(ST_CUSTPAYMENT, $trans_no, true);
          void_gl_trans(ST_CUSTPAYMENT, $trans_no, true);
          void_cust_allocations(ST_CUSTPAYMENT, $trans_no, $date_);
        }
+
+       $payment_no = write_customer_trans(ST_CUSTPAYMENT, $trans_no, $customer_id, $branch_id, 
+               $date_, $ref, $amount, $discount, 0, 0, 0, 0, 0, 0, "", 0, $rate);
+   
+       $bank_gl_account = get_bank_gl_account($bank_account);
+
        $total = 0;
        /* Bank account entry first */
        $total += add_gl_trans_customer(ST_CUSTPAYMENT, $payment_no, $date_,
@@ -65,7 +72,7 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
 
        if ($charge != 0)       {
                /* Now Debit bank charge account with charges */
-               $charge_act = get_company_pref('bank_charge_act');
+               $charge_act = get_bank_charge_account($bank_account);
                $total += add_gl_trans_customer(ST_CUSTPAYMENT, $payment_no, $date_,
                        $charge_act, 0, 0, $charge, $customer_id,
                        "Cannot insert a GL transaction for the payment bank charge debit", $rate);
@@ -82,6 +89,8 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
 
        $Refs->save(ST_CUSTPAYMENT, $payment_no, $ref);
 
+       $args->trans_no = $payment_no;
+       hook_db_postwrite($args, ST_CUSTPAYMENT);
        commit_transaction();
 
        return $payment_no;
@@ -93,6 +102,7 @@ function void_customer_payment($type, $type_no)
 {
        begin_transaction();
 
+       hook_db_prevoid($type, $type_no);
        void_bank_trans($type, $type_no, true);
        void_gl_trans($type, $type_no, true);
        void_cust_allocations($type, $type_no);