Eliminated non-static method calls and other bulk fixes to fix php5 warnings

[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 4a5c932bc347e8adff0ac89b92d5dc94955784bd..f7e56866f8950b6974621530008867d1ec002c1e 100644 (file)
--- a/sales/includes/db/payment_db.inc
+++ b/sales/includes/db/payment_db.inc
@@ -1,20 +1,22 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 /*
   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)
 {
+       global $Refs;
+
        begin_transaction();
 
        $company_record = get_company_prefs();
@@ -33,10 +35,10 @@ 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()) {
+       if ($branch_id != ANY_NUMERIC) {
 
                $branch_data = get_branch_accounts($branch_id);
 
@@ -61,17 +63,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);       
+       add_gl_balance(12, $payment_no, $date_, -$total, PT_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,
-               get_customer_currency($customer_id));
+               $date_, $amount - $charge, PT_CUSTOMER, $customer_id,
+               get_customer_currency($customer_id), "", $rate);
 
        add_comments(12, $payment_no, $date_, $memo_);
 
-       references::save_last($ref, 12);
+       $Refs->save(12, $payment_no, $ref);
 
        commit_transaction();