X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fpayment_db.inc;h=8ae5bdf3c1d3e0f4fd7227f1f80b11c0ce2fe70f;hb=5dec41f0d87e407e1c9ffcb8eb63b92e4e471a9b;hp=3697196915ece047d2597bd1f37566a5cb2ce034;hpb=1a851e527fe366364c6d2baaf2684222f9394b48;p=fa-stable.git diff --git a/sales/includes/db/payment_db.inc b/sales/includes/db/payment_db.inc index 36971969..8ae5bdf3 100644 --- a/sales/includes/db/payment_db.inc +++ b/sales/includes/db/payment_db.inc @@ -13,7 +13,7 @@ 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) { begin_transaction(); @@ -33,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_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()) { @@ -61,12 +61,19 @@ 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); /*now enter the bank_trans entry */ add_bank_trans(12, $payment_no, $bank_account, $ref, - $date_, $amount, payment_person_types::customer(), $customer_id, + $date_, $amount - $charge, payment_person_types::customer(), $customer_id, get_customer_currency($customer_id)); add_comments(12, $payment_no, $date_, $memo_);