X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fincludes%2Fdb%2Fgl_db_banking.inc;h=bc4c0b5bd5fd6c794999441d18cb49a1f858e78a;hb=a4db318fa0c84e099e0970ca82e36215782d661e;hp=dbf5151a65df27a91bcfc2dce1e9e7cc6cd89d36;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc index dbf5151a..bc4c0b5b 100644 --- a/gl/includes/db/gl_db_banking.inc +++ b/gl/includes/db/gl_db_banking.inc @@ -1,161 +1,229 @@ . +***********************************************************************/ +function add_exchange_variation($trans_type, $trans_no, $date_, $account, + $currency, $person_type_id=null, $person_id = "") +{ + if (is_company_currency($currency)) + return; + if ($date_ == null) + $date_ = Today(); + $rate = get_exchange_rate_from_home_currency($currency, $date_); + $result = db_query("SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE + bank_act='$account' AND trans_date<='".date2sql($date_)."'", + "Transactions for account $account could not be calculated"); + $row = db_fetch_row($result); + $foreign_amount = $row[0]; + $amount = get_gl_trans_from_to("", $date_, $account); + $diff = $amount - (round2($foreign_amount * $rate, user_price_dec())); + if ($diff != 0) + { + if ($trans_type == null) + $trans_type = systypes::journal_entry(); + if ($trans_no == null) + $trans_no = get_next_trans_no($trans_type); + if ($person_type_id == null) + $person_type_id = payment_person_types::misc(); + add_gl_trans($trans_type, $trans_no, $date_, $account, 0, 0, _("Exchange Variance"), + -$diff, null, $person_type_id, $person_id); + add_gl_trans($trans_type, $trans_no, $date_, get_company_pref('exchange_diff_act'), 0, 0, + _("Exchange Variance"), $diff, null, $person_type_id, $person_id); + } +} +function add_exchange_variation_all() +{ + $trans_no = get_next_trans_no(0); + $sql = "SELECT * FROM ".TB_PREF."bank_accounts"; + $result = db_query($sql, "could not retreive bank accounts"); + while ($myrow = db_fetch($result)) + add_exchange_variation(0, $trans_no, null, $myrow['account_code'], + $myrow['currency_code']); +} //---------------------------------------------------------------------------------- - -function add_bank_transfer($from_account, $to_account, $date_, - $amount, $payment_type, $ref, $memo_) +// Add bank tranfer to database. +// +// $from_account - source bank account id +// $to_account - target bank account id +// + +function add_bank_transfer($from_account, $to_account, $date_, + $amount, $ref, $memo_) { begin_transaction(); - + $trans_type = systypes::bank_transfer(); - + $currency = get_bank_account_currency($from_account); $trans_no = get_next_trans_no($trans_type); - + + $from_gl_account = get_bank_gl_account($from_account); + $to_gl_account = get_bank_gl_account($to_account); + + $total = 0; // do the source account postings - add_gl_trans($trans_type, $trans_no, $date_, $from_account, 0, 0, "", - -$amount, $currency); - - add_bank_trans($trans_type, $trans_no, $from_account, $ref, - $date_, $payment_type, -$amount, - payment_person_types::misc(), "", $currency, + $total += add_gl_trans($trans_type, $trans_no, $date_, $from_gl_account, 0, 0, "", + -$amount, $currency); + + add_bank_trans($trans_type, $trans_no, $from_account, $ref, + $date_, -$amount, + payment_person_types::misc(), "", $currency, "Cannot insert a source bank transaction"); - + + add_exchange_variation($trans_type, $trans_no, $date_, $from_account, + $currency, payment_person_types::misc(), ""); + // do the destination account postings - add_gl_trans($trans_type, $trans_no, $date_, $to_account, 0, 0, "", + $total += add_gl_trans($trans_type, $trans_no, $date_, $to_gl_account, 0, 0, "", $amount, $currency); + + /*Post a balance post if $total != 0 */ + add_gl_balance($trans_type, $trans_no, $date_, -$total); - add_bank_trans($trans_type, $trans_no, $to_account, $ref, - $date_, $payment_type, $amount, - payment_person_types::misc(), "", - $currency, - "Cannot insert a destination bank transaction"); - - add_comments($trans_type, $trans_no, $date_, $memo_); - - add_forms_for_sys_type($trans_type, $trans_no, $from_account, $to_account); - - references::save_last($ref, $trans_type); + add_bank_trans($trans_type, $trans_no, $to_account, $ref, + $date_, $amount, payment_person_types::misc(), "", + $currency, "Cannot insert a destination bank transaction"); + + add_exchange_variation($trans_type, $trans_no, $date_, $from_account, + $currency, payment_person_types::misc(), ""); + add_comments($trans_type, $trans_no, $date_, $memo_); + + references::save_last($ref, $trans_type); + commit_transaction(); - - return $trans_no; + + return $trans_no; } //---------------------------------------------------------------------------------- - -// $amount is in $from_account's currency - +// Add bank payment or deposit to database. +// +// $from_account - bank account id +// $item - transaction cart (line item's amounts in bank account's currency) +// $person_type_id - defines type of $person_id identifiers +// $person_id - supplier/customer/other id +// $person_detail_id - customer branch id or not used +// // returns an array of (inserted trans type, trans no) function add_bank_transaction($trans_type, $from_account, $items, $date_, - $person_type_id, $person_id, $person_detail_id, $type, $ref, $memo_) + $person_type_id, $person_id, $person_detail_id, $ref, $memo_) { // we can only handle type 1 (payment)and type 2 (deposit) if ($trans_type != systypes::bank_payment() && $trans_type != systypes::bank_deposit()) display_db_error("Invalid type ($trans_type) sent to add_bank_transaction"); - begin_transaction(); - - $currency = get_bank_account_currency($from_account); + $do_exchange_variance = false; + begin_transaction(); + + $currency = get_bank_account_currency($from_account); + $bank_gl_account = get_bank_gl_account($from_account); + // the gl items are already inversed/negated for type 2 (deposit) $total_amount = $items->gl_items_total(); - - if ($person_type_id == payment_person_types::customer()) + + if ($person_type_id == payment_person_types::customer()) { // we need to add a customer transaction record - + // convert to customer currency $cust_amount = exchange_from_to($total_amount, $currency, get_customer_currency($person_id), $date_); - - $trans_no = add_customer_trans($trans_type, $person_id, $person_detail_id, $date_, - $ref, $cust_amount); + // we need to negate it too + $cust_amount = -$cust_amount; + + $trans_no = write_customer_trans($trans_type, 0, $person_id, $person_detail_id, $date_, + $ref, $cust_amount); - } - elseif ($person_type_id == payment_person_types::supplier()) + } + elseif ($person_type_id == payment_person_types::supplier()) { // we need to add a supplier transaction record // convert to supp currency $supp_amount = exchange_from_to($total_amount, $currency, get_supplier_currency($person_id), $date_); - - // we need to negate it too + + // we need to negate it too $supp_amount = -$supp_amount; $trans_no = add_supp_trans($trans_type, $person_id, $date_, '', $ref, "", $supp_amount, 0, 0); - } - else + } + else { $trans_no = get_next_trans_no($trans_type); - } - + $do_exchange_variance = true; + } + // do the source account postings - add_gl_trans($trans_type, $trans_no, $date_, $from_account, 0, 0, "", - -$total_amount, $currency, $person_type_id, $person_id); - - add_bank_trans($trans_type, $trans_no, $from_account, $ref, - $date_, $type, -$total_amount, - $person_type_id, $person_id, - $currency, + + add_bank_trans($trans_type, $trans_no, $from_account, $ref, + $date_, -$total_amount, + $person_type_id, $person_id, + $currency, "Cannot insert a source bank transaction"); - + $total = 0; foreach ($items->gl_items as $gl_item) { $is_bank_to = is_bank_account($gl_item->code_id); - - if ($trans_type == 1 AND $is_bank_to) + + if ($trans_type == 1 AND $is_bank_to) { // we don't allow payments to go to a bank account. use transfer for this ! display_db_error("invalid payment entered. Cannot pay to another bank account", ""); - } - + } + // do the destination account postings - add_gl_trans($trans_type, $trans_no, $date_, $gl_item->code_id, - $gl_item->dimension_id, $gl_item->dimension2_id, $gl_item->reference, + $total += add_gl_trans($trans_type, $trans_no, $date_, $gl_item->code_id, + $gl_item->dimension_id, $gl_item->dimension2_id, $gl_item->reference, $gl_item->amount, $currency, $person_type_id, $person_id); - - if ($is_bank_to) + + if ($is_bank_to) { - add_bank_trans($trans_type, $trans_no, $gl_item->code_id, $ref, - $date_, $type, $gl_item->amount, - $person_type_id, $person_id, $currency, - "Cannot insert a destination bank transaction"); - } + add_bank_trans($trans_type, $trans_no, $gl_item->code_id, $ref, + $date_, $gl_item->amount, + $person_type_id, $person_id, $currency, + "Cannot insert a destination bank transaction"); + if ($do_exchange_variance) + add_exchange_variation($trans_type, $trans_no, $date_, $gl_item->code_id, + $currency, $person_type_id, $person_id); + } + // store tax details if the gl account is a tax account + + $amount = $gl_item->amount; + $ex_rate = get_exchange_rate_from_home_currency($currency, $date_); + + add_gl_tax_details($gl_item->code_id, $trans_type, $trans_no, $amount, + $ex_rate, $date_, $memo_); } - - add_comments($trans_type, $trans_no, $date_, $memo_); - - add_forms_for_sys_type($trans_type, $trans_no, $person_type_id, $person_id); - - references::save_last($ref, $trans_type); - - commit_transaction(); - - return array($trans_type, $trans_no); -} -//---------------------------------------------------------------------------------------- + // do the source account postings + add_gl_trans($trans_type, $trans_no, $date_, $bank_gl_account, 0, 0, $memo_, + -$total, null, $person_type_id, $person_id); -function add_bank_payment($from_account, $items, $date_, - $person_type_id, $person_id, $person_detail_id, $type, $ref, $memo_) -{ - return add_bank_transaction(systypes::bank_payment(), $from_account, $items, $date_, - $person_type_id, $person_id, $person_detail_id, $type, $ref, $memo_); -} + if ($do_exchange_variance) + add_exchange_variation($trans_type, $trans_no, $date_, $from_account, + $currency, $person_type_id, $person_id); -//--------------------------------------------------------------------------------------------- + add_comments($trans_type, $trans_no, $date_, $memo_); -function add_bank_deposit($from_account, $items, $date_, - $person_type_id, $person_id, $person_detail_id, $type, $ref, $memo_) -{ - return add_bank_transaction(systypes::bank_deposit(), $from_account, $items, $date_, - $person_type_id, $person_id, $person_detail_id, $type, $ref, $memo_); -} + references::save_last($ref, $trans_type); + + commit_transaction(); -//--------------------------------------------------------------------------------------------- + return array($trans_type, $trans_no); +} +//---------------------------------------------------------------------------------------- ?> \ No newline at end of file