X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_banking.inc;h=58825018e3e12db6fb01beaac3bb9aa4aec86079;hb=4a4cafb0a0184fdcc96fcde391f01ce02dbf31b1;hp=ca3d5867442caf51d1443bf37e4d1425878e73a1;hpb=b6af4ea4c99734cfd051395289107bbba5a405e9;p=fa-stable.git diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc index ca3d5867..58825018 100644 --- a/gl/includes/db/gl_db_banking.inc +++ b/gl/includes/db/gl_db_banking.inc @@ -1,17 +1,94 @@ . +***********************************************************************/ +function add_exchange_variation($trans_no, $date_, $acc_id, $account, + $currency, $person_type_id=null, $person_id = "") +{ + if (is_company_currency($currency)) + return false; + if ($date_ == null) + $date_ = Today(); + $for_amount = 0; + + // We have to calculate all the currency accounts belonging to the GL account + // upto $date_ and calculate with the exchange rates. And then compare with the GL account balance. + // 2010-02-23 Joe Hunt with help of Ary Wibowo + $sql = "SELECT SUM(bt.amount) AS for_amount, ba.bank_curr_code + FROM ".TB_PREF."bank_trans bt, ".TB_PREF."bank_accounts ba + WHERE ba.id = bt.bank_act AND ba.account_code = ".db_escape($account)." AND bt.trans_date<='".date2sql($date_)."' + GROUP BY ba.bank_curr_code"; + $result = db_query($sql, "Transactions for bank account $acc_id could not be calculated"); + while ($row = db_fetch($result)) + { + if ($row['for_amount'] == 0) + continue; + $rate = get_exchange_rate_from_home_currency($row['bank_curr_code'], $date_); + $for_amount += round2($row['for_amount'] * $rate, user_price_dec()); + } + $amount = get_gl_trans_from_to("", $date_, $account); + $diff = $amount - $for_amount; + if ($diff != 0) + { + if ($trans_no == null) + $trans_no = get_next_trans_no(ST_JOURNAL); + if ($person_type_id == null) + $person_type_id = PT_MISC; + add_gl_trans(ST_JOURNAL, $trans_no, $date_, $account, 0, 0, _("Exchange Variance"), + -$diff, null, $person_type_id, $person_id); + add_gl_trans(ST_JOURNAL, $trans_no, $date_, get_company_pref('exchange_diff_act'), 0, 0, + _("Exchange Variance"), $diff, null, $person_type_id, $person_id); + } + return ($diff != 0); +} +function add_exchange_variation_all($date=null, $ref="", $memo) +{ + global $Refs; + begin_transaction(); + $exchanged = false; + $trans_no = get_next_trans_no(ST_JOURNAL); + $sql = "SELECT * FROM ".TB_PREF."bank_accounts"; + $result = db_query($sql, "could not retreive bank accounts"); + while ($myrow = db_fetch($result)) + { + if (add_exchange_variation($trans_no, $date, $myrow['id'], $myrow['account_code'], + $myrow['bank_curr_code'])) + $exchanged = true; + } + if ($exchanged) + { + add_comments(ST_JOURNAL, $trans_no, $date, $memo); + if ($ref == "") + $ref = $Refs->get_next(ST_JOURNAL); + $Refs->save(ST_JOURNAL, $trans_no, $ref); + add_audit_trail(ST_JOURNAL, $trans_no, $date); + } + commit_transaction(); + return ($exchanged ? $trans_no : 0); +} //---------------------------------------------------------------------------------- // 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_) + $amount, $ref, $memo_, $charge=0) { + global $Refs, $SysPrefs; + begin_transaction(); - $trans_type = systypes::bank_transfer(); + $trans_type = ST_BANKTRANSFER; $currency = get_bank_account_currency($from_account); @@ -19,30 +96,56 @@ function add_bank_transfer($from_account, $to_account, $date_, $from_gl_account = get_bank_gl_account($from_account); $to_gl_account = get_bank_gl_account($to_account); - + + $exchanged = false; $total = 0; // do the source account postings $total += add_gl_trans($trans_type, $trans_no, $date_, $from_gl_account, 0, 0, "", - -$amount, $currency); + -($amount + $charge), $currency); add_bank_trans($trans_type, $trans_no, $from_account, $ref, - $date_, -$amount, - payment_person_types::misc(), "", $currency, + $date_, -($amount + $charge), + PT_MISC, "", $currency, "Cannot insert a source bank transaction"); - + if ($SysPrefs->auto_currency_revaluation()) + { + $trans_no1 = get_next_trans_no(ST_JOURNAL); + if (add_exchange_variation($trans_no1, $date_, $from_account, $from_gl_account, $currency)) + $exchanged = true; + } + if ($charge != 0) + { + /* Now Debit bank charge account with charges */ + $charge_act = get_company_pref('bank_charge_act'); + $total += add_gl_trans($trans_type, $trans_no, $date_, + $charge_act, 0, 0, "", $charge, $currency); + } // do the destination account postings $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_, $amount, payment_person_types::misc(), "", + $date_, $amount, PT_MISC, "", $currency, "Cannot insert a destination bank transaction"); + if ($SysPrefs->auto_currency_revaluation()) + { + $currency = get_bank_account_currency($to_account); + + if ($exchanged || add_exchange_variation($trans_no1, $date_, $to_account, $to_gl_account, $currency)) + { + $ref1 = $Refs->get_next(ST_JOURNAL); + $Refs->save(ST_JOURNAL, $trans_no1, $ref1); + add_audit_trail(ST_JOURNAL, $trans_no1, $date_); + } + } add_comments($trans_type, $trans_no, $date_, $memo_); - references::save_last($ref, $trans_type); + $Refs->save($trans_type, $trans_no, $ref); + add_audit_trail($trans_type, $trans_no, $date_); commit_transaction(); @@ -61,13 +164,18 @@ function add_bank_transfer($from_account, $to_account, $date_, // 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, $ref, $memo_) + $person_type_id, $person_id, $person_detail_id, $ref, $memo_, $use_transaction=true) { + global $Refs, $SysPrefs; + // we can only handle type 1 (payment)and type 2 (deposit) - if ($trans_type != systypes::bank_payment() && $trans_type != systypes::bank_deposit()) + if ($trans_type != ST_BANKPAYMENT && $trans_type != ST_BANKDEPOSIT) display_db_error("Invalid type ($trans_type) sent to add_bank_transaction"); - begin_transaction(); + $do_exchange_variance = false; + $exchanged = false; + if ($use_transaction) + begin_transaction(); $currency = get_bank_account_currency($from_account); $bank_gl_account = get_bank_gl_account($from_account); @@ -75,7 +183,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_, // 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 == PT_CUSTOMER) { // we need to add a customer transaction record @@ -88,7 +196,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_, $ref, $cust_amount); } - elseif ($person_type_id == payment_person_types::supplier()) + elseif ($person_type_id == PT_SUPPLIER) { // we need to add a supplier transaction record // convert to supp currency @@ -104,11 +212,12 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_, else { $trans_no = get_next_trans_no($trans_type); + $do_exchange_variance = $SysPrefs->auto_currency_revaluation(); + if ($do_exchange_variance) + $trans_no1 = get_next_trans_no(ST_JOURNAL); } // do the source account postings - add_gl_trans($trans_type, $trans_no, $date_, $bank_gl_account, 0, 0, "", - -$total_amount, $currency, $person_type_id, $person_id); add_bank_trans($trans_type, $trans_no, $from_account, $ref, $date_, -$total_amount, @@ -120,7 +229,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_, { $is_bank_to = is_bank_account($gl_item->code_id); - if ($trans_type == 1 AND $is_bank_to) + if ($trans_type == ST_BANKPAYMENT 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", ""); @@ -133,21 +242,47 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_, if ($is_bank_to) { - 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"); + add_bank_trans($trans_type, $trans_no, $is_bank_to, $ref, + $date_, $gl_item->amount, + $person_type_id, $person_id, $currency, + "Cannot insert a destination bank transaction"); + if ($do_exchange_variance) + { + if (add_exchange_variation($trans_no1, $date_, $is_bank_to, $gl_item->code_id, + $currency, $person_type_id, $person_id)) + $exchanged = true; + } } + // 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_); } // do the source account postings - add_gl_trans($trans_type, $trans_no, $date_, $bank_gl_account, 0, 0, "", + add_gl_trans($trans_type, $trans_no, $date_, $bank_gl_account, 0, 0, $memo_, -$total, null, $person_type_id, $person_id); + if ($do_exchange_variance) + { + if ($exchanged || add_exchange_variation($trans_no1, $date_, $from_account, $bank_gl_account, + $currency, $person_type_id, $person_id)) + { + $ref1 = $Refs->get_next(ST_JOURNAL); + $Refs->save(ST_JOURNAL, $trans_no1, $ref1); + add_audit_trail(ST_JOURNAL, $trans_no1, $date_); + } + } add_comments($trans_type, $trans_no, $date_, $memo_); - references::save_last($ref, $trans_type); + $Refs->save($trans_type, $trans_no, $ref); + add_audit_trail($trans_type, $trans_no, $date_); - commit_transaction(); + if ($use_transaction) + commit_transaction(); return array($trans_type, $trans_no); }