Merging version 2.1 RC 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 cda2d68a4097372a1fa62dba01800b3e85800dd4..12e7cc0fab833df3b19219c4fc50284a0092df10 100644 (file)
--- a/sales/includes/db/payment_db.inc
+++ b/sales/includes/db/payment_db.inc
@@ -1,9 +1,19 @@
 <?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_, $rate=0)
+       $date_, $ref, $amount, $discount, $memo_, $rate=0)
 {
        begin_transaction();
 
@@ -12,6 +22,8 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
        $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, $trans_no);
          void_bank_trans(12, $trans_no, true);
@@ -21,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_account, 0, 0, $amount,  $customer_id,
+               $bank_gl_account, 0, 0, $amount,  $customer_id,
                "Cannot insert a GL transaction for the bank account debit", $rate);
 
        if ($branch_id != reserved_words::get_any_numeric()) {
@@ -54,7 +66,7 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
 
        /*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,
+               $date_, $amount, payment_person_types::customer(), $customer_id,
                get_customer_currency($customer_id));
 
        add_comments(12, $payment_no, $date_, $memo_);