X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_payment_db.inc;h=62f56a79c88253967b7503045c03755d26b7efc3;hb=4deaa6ba6e084655989c30cfb7d9dd307408c7dc;hp=7014cec44a137bf56a23207c783731e70e879452;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/purchasing/includes/db/supp_payment_db.inc b/purchasing/includes/db/supp_payment_db.inc index 7014cec4..62f56a79 100644 --- a/purchasing/includes/db/supp_payment_db.inc +++ b/purchasing/includes/db/supp_payment_db.inc @@ -1,57 +1,96 @@ . +***********************************************************************/ +function write_supp_payment($trans_no, $supplier_id, $bank_account, + $date_, $ref, $supp_amount, $supp_discount, $memo_, $bank_charge=0, $bank_amount=0) { - begin_transaction(); - - $supplier_currency = get_supplier_currency($supplier_id); - $bank_account_currency = get_bank_account_currency($bank_account); - - $supp_amount = exchange_from_to($amount, $bank_account_currency, $supplier_currency, $date_); - $supp_discount = exchange_from_to($discount, $bank_account_currency, $supplier_currency, $date_); - - // it's a supplier payment - $trans_type = 22; + global $Refs; + + begin_transaction(__FUNCTION__, func_get_args()); + $args = func_get_args(); while (count($args) < 10) $args[] = 0; + $args = (object)array_combine(array('trans_no', 'supplier_id', 'bank_account', 'date_', + 'ref', 'bank_amount', 'supp_amount', 'supp_discount', 'memo_', 'bank_charge'), $args); + $args->trans_no = 0; + hook_db_prewrite( $args, ST_SUPPAYMENT); + + if ($trans_no != 0) { + delete_comments(ST_SUPPAYMENT, $trans_no); + void_bank_trans(ST_SUPPAYMENT, $trans_no, true); + void_gl_trans(ST_SUPPAYMENT, $trans_no, true); + void_cust_allocations(ST_SUPPAYMENT, $trans_no, $date_); + } + + $bank = get_bank_account($bank_account); + + if (!$bank_amount) // auto + { + $rate = get_exchange_rate_from_to(get_supplier_currency($supplier_id), + $bank['bank_curr_code'], $date_ ); + $bank_amount = $supp_amount/$rate; + } + + if ($bank['bank_curr_code'] == get_company_currency()) // [0002506] + $rate = $bank_amount/$supp_amount; + else + $rate = 0; /* Create a supp_trans entry for the supplier payment */ - $payment_id = add_supp_trans($trans_type, $supplier_id, $date_, $date_, - $ref, "", -$supp_amount, 0, -$supp_discount); + $payment_id = write_supp_trans(ST_SUPPAYMENT, 0, $supplier_id, $date_, $date_, + $ref, "", -$supp_amount, 0, -$supp_discount, $rate); - // Now debit creditors account with payment + discount + // Now debit creditors account with payment + discount + $total = 0; $supplier_accounts = get_supplier_accounts($supplier_id); - - add_gl_trans_supplier($trans_type, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0, - $supp_amount + $supp_discount, $supplier_id); - + $total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0, + $supp_amount + $supp_discount, $supplier_id, $rate); + // Now credit discount received account with discounts if ($supp_discount != 0) { - add_gl_trans_supplier($trans_type, $payment_id, $date_, $supplier_accounts["payment_discount_account"], 0, 0, - -$supp_discount, $supplier_id); + $total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payment_discount_account"], 0, 0, + -$supp_discount, $supplier_id, $rate); + } + + if ($bank_charge != 0) + { + $charge_act = get_company_pref('bank_charge_act'); + $total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $charge_act, 0, 0, '', + $bank_charge, $bank['bank_curr_code']); } - - if ($supp_amount != 0) + + $total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $bank['account_code'], 0, 0, '', + -($bank_amount + $bank_charge), $bank['bank_curr_code'], PT_SUPPLIER, $supplier_id); + + /*Post a balance post if $total != 0 due to variance in AP and bank posted values*/ + if ($total != 0) { - add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_account, 0, 0, - -$supp_amount, $supplier_id); - } + $variance_act = get_company_pref('exchange_diff_act'); + add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $variance_act, 0, 0, '', + -$total, null, PT_SUPPLIER, $supplier_id); + } /*now enter the bank_trans entry */ - add_bank_trans($trans_type, $payment_id, $bank_account, $ref, - $date_, $payment_type, -($amount), payment_person_types::supplier(), - $supplier_id, $bank_account_currency, - "Could not add the supplier payment bank transaction"); - - add_comments($trans_type, $payment_id, $date_, $memo_); - - add_forms_for_sys_type($trans_type, $payment_id, payment_person_types::supplier(), $supplier_id); - - references::save_last($ref, $trans_type); - - commit_transaction(); - + add_bank_trans(ST_SUPPAYMENT, $payment_id, $bank_account, $ref, + $date_, -($bank_amount + $bank_charge), PT_SUPPLIER, $supplier_id); + + add_comments(ST_SUPPAYMENT, $payment_id, $date_, $memo_); + + $Refs->save(ST_SUPPAYMENT, $payment_id, $ref); + + $args->trans_no = $payment_id; + hook_db_postwrite($args, ST_SUPPAYMENT); + + commit_transaction(); + return $payment_id; } @@ -59,15 +98,15 @@ function add_supp_payment($supplier_id, $date_, $payment_type, $bank_account, function void_supp_payment($type, $type_no) { - begin_transaction(); - + begin_transaction(__FUNCTION__, func_get_args()); + hook_db_prevoid($type, $type_no); + void_bank_trans($type, $type_no, true); void_gl_trans($type, $type_no, true); - void_supp_allocations($type, $type_no); + void_supp_allocations($type, $type_no); void_supp_trans($type, $type_no); - + commit_transaction(); } -?> \ No newline at end of file