X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_payment_db.inc;h=b5adb16382ee3becd14c77ca34333d11b456d4a7;hb=eefe5267ed97b38ac66179141994fc8c9dd09ea8;hp=99fe530cad6001999c24d949c3cd87650ccee07b;hpb=fa43a9c974d05b77517a0d8e3e510ef4a088632e;p=fa-stable.git diff --git a/purchasing/includes/db/supp_payment_db.inc b/purchasing/includes/db/supp_payment_db.inc index 99fe530c..b5adb163 100644 --- a/purchasing/includes/db/supp_payment_db.inc +++ b/purchasing/includes/db/supp_payment_db.inc @@ -14,7 +14,7 @@ function write_supp_payment($trans_no, $supplier_id, $bank_account, { global $Refs; - begin_transaction(); + 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); @@ -28,26 +28,38 @@ function write_supp_payment($trans_no, $supplier_id, $bank_account, 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 = write_supp_trans(ST_SUPPAYMENT, 0, $supplier_id, $date_, $date_, - $ref, "", -$supp_amount, 0, -$supp_discount); + $ref, "", -$supp_amount, 0, -$supp_discount, $rate); // Now debit creditors account with payment + discount $total = 0; $supplier_accounts = get_supplier_accounts($supplier_id); $total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0, - $supp_amount + $supp_discount, $supplier_id); + $supp_amount + $supp_discount, $supplier_id, $rate); // Now credit discount received account with discounts if ($supp_discount != 0) { $total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payment_discount_account"], 0, 0, - -$supp_discount, $supplier_id); + -$supp_discount, $supplier_id, $rate); } - $bank = get_bank_account($bank_account); - if ($bank_charge != 0) { $charge_act = get_company_pref('bank_charge_act'); @@ -56,7 +68,7 @@ function write_supp_payment($trans_no, $supplier_id, $bank_account, } $total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $bank['account_code'], 0, 0, '', - -($bank_amount + $bank_charge), $bank['bank_curr_code']); + -($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) @@ -68,7 +80,7 @@ function write_supp_payment($trans_no, $supplier_id, $bank_account, /*now enter the bank_trans entry */ add_bank_trans(ST_SUPPAYMENT, $payment_id, $bank_account, $ref, - $date_, -($bank_amount + $bank_charge), PT_SUPPLIER, $supplier_id); + $date_, -$bank_amount, -$bank_charge, PT_SUPPLIER, $supplier_id); add_comments(ST_SUPPAYMENT, $payment_id, $date_, $memo_); @@ -82,100 +94,11 @@ function write_supp_payment($trans_no, $supplier_id, $bank_account, return $payment_id; } -//------------------------------------------------------------------------------------------------ -/* - This is legacy code, leaved here to provide compatibility for 2.3 extension modules. - Will be removed in 2.4 due to design issues. -*/ -function add_supp_payment($supplier_id, $date_, $bank_account, - $amount, $discount, $ref, $memo_, $rate=0, $charge=0) -{ - global $Refs; - - begin_transaction(); - $args = func_get_args(); while (count($args) < 9) $args[] = 0; - $args = (object)array_combine(array('supplier_id', 'date_', 'bank_account', - 'amount', 'discount', 'ref', 'memo_', 'rate', 'charge'), $args); - $args->trans_no = 0; - hook_db_prewrite( $args, ST_SUPPAYMENT); - - $supplier_currency = get_supplier_currency($supplier_id); - $bank_account_currency = get_bank_account_currency($bank_account); - $bank_gl_account = get_bank_gl_account($bank_account); - - if ($rate == 0) - { - $supp_amount = exchange_from_to($amount, $bank_account_currency, $supplier_currency, $date_); - $supp_discount = exchange_from_to($discount, $bank_account_currency, $supplier_currency, $date_); - $supp_charge = exchange_from_to($charge, $bank_account_currency, $supplier_currency, $date_); - } - else - { - $supp_amount = round($amount / $rate, user_price_dec()); - $supp_discount = round($discount / $rate, user_price_dec()); - $supp_charge = round($charge / $rate, user_price_dec()); - } - - - // it's a supplier payment - $trans_type = ST_SUPPAYMENT; - - /* Create a supp_trans entry for the supplier payment */ - $payment_id = write_supp_trans($trans_type, 0, $supplier_id, $date_, $date_, - $ref, "", -$supp_amount, 0, -$supp_discount, "", $rate); - - // Now debit creditors account with payment + discount - - $total = 0; - $supplier_accounts = get_supplier_accounts($supplier_id); - $total += add_gl_trans_supplier($trans_type, $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) - { - $total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $supplier_accounts["payment_discount_account"], 0, 0, - -$supp_discount, $supplier_id, "", $rate); - } - - if ($supp_charge != 0) - { - $charge_act = get_bank_charge_account($bank_account); - $total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $charge_act, 0, 0, - $supp_charge, $supplier_id, "", $rate); - } - - if ($supp_amount != 0) - { - $total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_gl_account, 0, 0, - -($supp_amount + $supp_charge), $supplier_id, "", $rate); - } - - /*Post a balance post if $total != 0 */ - add_gl_balance($trans_type, $payment_id, $date_, -$total, PT_SUPPLIER, $supplier_id); - - /*now enter the bank_trans entry */ - add_bank_trans($trans_type, $payment_id, $bank_account, $ref, - $date_, -($amount + $supp_charge), PT_SUPPLIER, - $supplier_id, $bank_account_currency, - "Could not add the supplier payment bank transaction"); - - add_comments($trans_type, $payment_id, $date_, $memo_); - - $Refs->save($trans_type, $payment_id, $ref); - - $args->trans_no = $payment_id; - hook_db_postwrite($args, ST_SUPPAYMENT); - commit_transaction(); - - return $payment_id; -} - //------------------------------------------------------------------------------------------------ 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); @@ -187,4 +110,3 @@ function void_supp_payment($type, $type_no) } -?> \ No newline at end of file