X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fincludes%2Fdb%2Fpayment_db.inc;h=12e7cc0fab833df3b19219c4fc50284a0092df10;hb=b2258b93a2c7a86245a2f8bd77093bc972cbe2b1;hp=e1147b1c856465ed1643e32f475a12bb6ed56596;hpb=45e45a854c40a7a2f9cc8f11e07a259c6923babd;p=fa-stable.git diff --git a/sales/includes/db/payment_db.inc b/sales/includes/db/payment_db.inc index e1147b1c..12e7cc0f 100644 --- a/sales/includes/db/payment_db.inc +++ b/sales/includes/db/payment_db.inc @@ -1,16 +1,26 @@ . +***********************************************************************/ /* Write/update customer payment. */ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_account, - $date_, $ref, $amount, $discount, $memo_) + $date_, $ref, $amount, $discount, $memo_, $rate=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); @@ -20,11 +30,11 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou void_gl_trans(12, $trans_no, true); void_cust_allocations(12, $trans_no, $date_); } - + $total = 0; /* Bank account entry first */ - add_gl_trans_customer(12, $payment_no, $date_, + $total += add_gl_trans_customer(12, $payment_no, $date_, $bank_gl_account, 0, 0, $amount, $customer_id, - "Cannot insert a GL transaction for the bank account debit"); + "Cannot insert a GL transaction for the bank account debit", $rate); if ($branch_id != reserved_words::get_any_numeric()) { @@ -39,19 +49,21 @@ 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); } + /*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_, $amount, payment_person_types::customer(), $customer_id,