Merged changes from main CVS up to 2.1.5

[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 5197a9965064e2a2f9c1f2be240c7ba5bdbe88e9..e88bf4d630431be8b33dbb29ddc8aa07182a760b 100644 (file)
--- a/sales/includes/db/payment_db.inc
+++ b/sales/includes/db/payment_db.inc
@@ -1,28 +1,40 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       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/gpl-3.0.html>.
+***********************************************************************/
 /*
   Write/update customer payment.
 */
 function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_account,
-       $date_, $receipt_type, $ref, $amount, $discount, $memo_)
+       $date_, $ref, $amount, $discount, $memo_, $rate=0, $charge=0)
 {
        begin_transaction();
 
        $company_record = get_company_prefs();
 
-       $payment_no = write_customer_trans(12, $trans_no,
-           $customer_id, $branch_id, $date_, $ref, $amount, $discount);
+       $payment_no = write_customer_trans(12, $trans_no, $customer_id, $branch_id, 
+               $date_, $ref, $amount, $discount, 0, 0, 0, 0, 0, 0, 0, "", 0, $rate);
+
+       $bank_gl_account = get_bank_gl_account($bank_account);
 
        if ($trans_no != 0) {
-         delete_comments(12, $invoice_no);
-         void_bank_trans(12, $type_no, true);
+         delete_comments(12, $trans_no);
+         void_bank_trans(12, $trans_no, true);
          void_gl_trans(12, $trans_no, true);
-         void_cust_allocations(12, $trans_no);
+         void_cust_allocations(12, $trans_no, $date_);
        }
-
+       $total = 0;
        /* Bank account entry first */
-       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");
+       $total += add_gl_trans_customer(12, $payment_no, $date_,
+               $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()) {
 
@@ -37,27 +49,36 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
        }
 
        if (($discount + $amount) != 0) {
-               /* Now Credit Debtors account with receipts + discounts */
-               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");
+       /* Now Credit Debtors account with receipts + discounts */
+       $total += 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", $rate);
        }
-
        if ($discount != 0)     {
                /* Now Debit discount account with discounts allowed*/
-               add_gl_trans_customer(12, $payment_no, $date_,
+               $total += 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");
+                       "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_, $receipt_type, $amount, payment_person_types::customer(), $customer_id,
-               get_customer_currency($customer_id));
+               $date_, $amount - $charge, payment_person_types::customer(), $customer_id,
+               get_customer_currency($customer_id), "", $rate);
 
        add_comments(12, $payment_no, $date_, $memo_);
 
-       references::save_last($ref, 12);
+       references::save(12, $payment_no, $ref);
 
        commit_transaction();