X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fpayment_db.inc;h=18ede1c6fa6f7f161d51508077d555f3a2f414cf;hb=eefe5267ed97b38ac66179141994fc8c9dd09ea8;hp=7eb77dfb2dfcc42d161d692c3ba2f1845f230a3e;hpb=4deaa6ba6e084655989c30cfb7d9dd307408c7dc;p=fa-stable.git diff --git a/sales/includes/db/payment_db.inc b/sales/includes/db/payment_db.inc index 7eb77dfb..18ede1c6 100644 --- a/sales/includes/db/payment_db.inc +++ b/sales/includes/db/payment_db.inc @@ -104,7 +104,7 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou /*now enter the bank_trans entry */ add_bank_trans(ST_CUSTPAYMENT, $payment_no, $bank_account, $ref, - $date_, $bank_amount - $charge, PT_CUSTOMER, $customer_id); + $date_, $bank_amount, -$charge, PT_CUSTOMER, $customer_id); add_comments(ST_CUSTPAYMENT, $payment_no, $date_, $memo_); @@ -132,35 +132,3 @@ function void_customer_payment($type, $type_no) commit_transaction(); } -/* - Retrieve bank charge amount from GL postings for customer payment. - . Bank charge is not stored explicitly in database as of 2.3.xx - . Due to roundings the retrieved charge can differ from the original amount when bank_curr!=home_curr && bank_curr!=cust_curr -*/ -function get_cust_bank_charge($type, $trans_no) -{ - - // restore charge amount from amounts in bank currency if possible, otherwise calculate from GL posting with exchange rate used for amount posting - $sql = "SELECT IF(act.bank_curr_code=home_curr.value, charge.amount, - IF(act.bank_curr_code=debtor.curr_code, -(trans.amount-ar.ov_amount+ar.ov_discount), - IFNULL(charge.amount*trans.amount/pmt.amount, 0))) - FROM ".TB_PREF."bank_trans trans - LEFT JOIN ".TB_PREF."bank_accounts act ON trans.bank_act=act.id - LEFT JOIN ".TB_PREF."sys_prefs charge_act ON charge_act.name='bank_charge_act' - LEFT JOIN ".TB_PREF."sys_prefs home_curr ON home_curr.name='curr_default' - LEFT JOIN ".TB_PREF."gl_trans charge ON charge.type=trans.type AND charge.type_no=trans.trans_no AND charge.account=charge_act.value - LEFT JOIN ".TB_PREF."gl_trans pmt ON pmt.type=trans.type AND pmt.type_no=trans.trans_no AND pmt.account=act.account_code - LEFT JOIN ".TB_PREF."debtors_master debtor ON trans.person_id=debtor.debtor_no AND trans.person_type_id=".PT_CUSTOMER." - LEFT JOIN ".TB_PREF."debtor_trans ar ON trans.type=ar.type AND trans.trans_no=ar.trans_no - WHERE pmt.amount!=0 AND charge.amount!=0 AND trans.amount!=0 - AND trans.type=".db_escape($type)." AND trans.trans_no=".db_escape($trans_no); - - $result = db_query($sql, "cannot retrieve bank charge"); - - if (!db_num_rows($result)) - return 0; - - $myrow = db_fetch($result); - return $myrow['0']; -} -