Moving 2.0 development version to main trunk.

[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 b5755857280fc36b16fd6dc58459b52db0b43937..5197a9965064e2a2f9c1f2be240c7ba5bdbe88e9 100644 (file)
--- a/sales/includes/db/payment_db.inc
+++ b/sales/includes/db/payment_db.inc
@@ -1,63 +1,66 @@
 <?php
-
-function add_customer_payment($customer_id, $branch_id, $bank_account, $date_, $receipt_type, $ref, 
-       $amount, $discount, $memo_)
+/*
+  Write/update customer payment.
+*/
+function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_account,
+       $date_, $receipt_type, $ref, $amount, $discount, $memo_)
 {
        begin_transaction();
-   
+
        $company_record = get_company_prefs();
-   
-       $payment_no = add_customer_trans(systypes::cust_payment(), $customer_id, $branch_id, $date_, 
-       $ref, -($amount), -($discount));                        
-               
+
+       $payment_no = write_customer_trans(12, $trans_no,
+           $customer_id, $branch_id, $date_, $ref, $amount, $discount);
+
+       if ($trans_no != 0) {
+         delete_comments(12, $invoice_no);
+         void_bank_trans(12, $type_no, true);
+         void_gl_trans(12, $trans_no, true);
+         void_cust_allocations(12, $trans_no);
+       }
+
        /* Bank account entry first */
-       add_gl_trans_customer(systypes::cust_payment(), $payment_no, $date_, 
+       add_gl_trans_customer(12, $payment_no, $date_,
                $bank_account, 0, 0, $amount,  $customer_id,
                "Cannot insert a GL transaction for the bank account debit");
-                                                       
-       if ($branch_id != reserved_words::get_any_numeric()) 
-       {
+
+       if ($branch_id != reserved_words::get_any_numeric()) {
+
                $branch_data = get_branch_accounts($branch_id);
 
                $debtors_account = $branch_data["receivables_account"];
-               $discount_account = $branch_data["payment_discount_account"];           
-               
-       } 
-       else 
-       {
+               $discount_account = $branch_data["payment_discount_account"];
+
+       } else {
                $debtors_account = $company_record["debtors_act"];
                $discount_account = $company_record["default_prompt_payment_act"];
        }
-       
-       if (($discount + $amount) != 0)
-       {
+
+       if (($discount + $amount) != 0) {
                /* Now Credit Debtors account with receipts + discounts */
-               add_gl_trans_customer(systypes::cust_payment(), $payment_no, $date_, 
+               add_gl_trans_customer(12, $payment_no, $date_,
                        $debtors_account, 0, 0, -($discount + $amount), $customer_id,
-                       "Cannot insert a GL transaction for the debtors account credit");               
-       }       
-       
-       if ($discount != 0)
-       {
+                       "Cannot insert a GL transaction for the debtors account credit");
+       }
+
+       if ($discount != 0)     {
                /* Now Debit discount account with discounts allowed*/
-               add_gl_trans_customer(systypes::cust_payment(), $payment_no, $date_, 
+               add_gl_trans_customer(12, $payment_no, $date_,
                        $discount_account, 0, 0, $discount, $customer_id,
                        "Cannot insert a GL transaction for the payment discount debit");
        }
-       
+
        /*now enter the bank_trans entry */
-       add_bank_trans(systypes::cust_payment(), $payment_no, $bank_account, $ref, 
+       add_bank_trans(12, $payment_no, $bank_account, $ref,
                $date_, $receipt_type, $amount, payment_person_types::customer(), $customer_id,
-               get_customer_currency($customer_id));    
-                                               
-       add_comments(systypes::cust_payment(), $payment_no, $date_, $memo_);                                            
-                                               
-       add_forms_for_sys_type(systypes::cust_payment(), $payment_no, payment_person_types::customer(), $customer_id);  
-       
-       references::save_last($ref, systypes::cust_payment());                                    
+               get_customer_currency($customer_id));
+
+       add_comments(12, $payment_no, $date_, $memo_);
+
+       references::save_last($ref, 12);
 
        commit_transaction();
-       
+
        return $payment_no;
 }
 
@@ -66,13 +69,13 @@ function add_customer_payment($customer_id, $branch_id, $bank_account, $date_, $
 function void_customer_payment($type, $type_no)
 {
        begin_transaction();
-       
+
        void_bank_trans($type, $type_no, true);
        void_gl_trans($type, $type_no, true);
        void_cust_allocations($type, $type_no);
        void_customer_trans($type, $type_no);
-       
-       commit_transaction();                   
+
+       commit_transaction();
 }