X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_banking.inc;h=3506a5c83f171b1b5e0902567df1160bce4dd74e;hb=380ae03e2df9602d07d156ae93b87cbe59b01b3a;hp=cc028ac75e0314469ab85a5d6a7aa873595b8814;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc index cc028ac7..3506a5c8 100644 --- a/gl/includes/db/gl_db_banking.inc +++ b/gl/includes/db/gl_db_banking.inc @@ -9,44 +9,70 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -function add_exchange_variation($trans_type, $trans_no, $date_, $acc_id, $account, +function add_exchange_variation($trans_no, $date_, $acc_id, $account, $currency, $person_type_id=null, $person_id = "") { if (is_company_currency($currency)) - return; + return false; 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='$acc_id' AND trans_date<='".date2sql($date_)."'", - "Transactions for account $account could not be calculated"); - $row = db_fetch_row($result); - $foreign_amount = $row[0]; + $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 - (round2($foreign_amount * $rate, user_price_dec())); + $diff = $amount - $for_amount; if ($diff != 0) { - if ($trans_type == null) - $trans_type = ST_JOURNAL; if ($trans_no == null) - $trans_no = get_next_trans_no($trans_type); + $trans_no = get_next_trans_no(ST_JOURNAL); if ($person_type_id == null) $person_type_id = PT_MISC; - add_gl_trans($trans_type, $trans_no, $date_, $account, 0, 0, _("Exchange Variance"), + add_gl_trans(ST_JOURNAL, $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, + 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() +function add_exchange_variation_all($date=null, $ref="", $memo) { - $trans_no = get_next_trans_no(0); + 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)) - add_exchange_variation(0, $trans_no, null, $myrow['id'], $myrow['account_code'], - $myrow['currency_code']); + { + 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. @@ -58,7 +84,7 @@ function add_exchange_variation_all() function add_bank_transfer($from_account, $to_account, $date_, $amount, $ref, $memo_, $charge=0) { - global $Refs; + global $Refs, $SysPrefs; begin_transaction(); @@ -70,7 +96,8 @@ 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, "", @@ -80,10 +107,12 @@ function add_bank_transfer($from_account, $to_account, $date_, $date_, -($amount + $charge), PT_MISC, "", $currency, "Cannot insert a source bank transaction"); - - add_exchange_variation($trans_type, $trans_no, $date_, $from_account, $from_gl_account, - $currency, PT_MISC, ""); - + 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 */ @@ -102,9 +131,17 @@ function add_bank_transfer($from_account, $to_account, $date_, $date_, $amount, PT_MISC, "", $currency, "Cannot insert a destination bank transaction"); - add_exchange_variation($trans_type, $trans_no, $date_, $from_account, $from_gl_account, - $currency, PT_MISC, ""); + 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_); $Refs->save($trans_type, $trans_no, $ref); @@ -127,17 +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; + global $Refs, $SysPrefs; // we can only handle type 1 (payment)and type 2 (deposit) if ($trans_type != ST_BANKPAYMENT && $trans_type != ST_BANKDEPOSIT) display_db_error("Invalid type ($trans_type) sent to add_bank_transaction"); $do_exchange_variance = false; - - begin_transaction(); + $exchanged = false; + if ($use_transaction) + begin_transaction(); $currency = get_bank_account_currency($from_account); $bank_gl_account = get_bank_gl_account($from_account); @@ -174,7 +212,9 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_, else { $trans_no = get_next_trans_no($trans_type); - $do_exchange_variance = true; + $do_exchange_variance = $SysPrefs->auto_currency_revaluation(); + if ($do_exchange_variance) + $trans_no1 = get_next_trans_no(ST_JOURNAL); } // do the source account postings @@ -189,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", ""); @@ -207,8 +247,10 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_, $person_type_id, $person_id, $currency, "Cannot insert a destination bank transaction"); if ($do_exchange_variance) - add_exchange_variation($trans_type, $trans_no, $date_, $is_bank_to, $gl_item->code_id, + { + add_exchange_variation($trans_no1, $date_, $is_bank_to, $gl_item->code_id, $currency, $person_type_id, $person_id); + } } // store tax details if the gl account is a tax account @@ -224,15 +266,158 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_, -$total, null, $person_type_id, $person_id); if ($do_exchange_variance) - add_exchange_variation($trans_type, $trans_no, $date_, $from_account, $bank_gl_account, - $currency, $person_type_id, $person_id); + { + 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_); $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); +} + +//---------------------------------------------------------------------------------------- + +//---------------------------------------------------------------------------------- +// Re-Insert bank payment or deposit to database using the transaction number passed. +// +// $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 reinsert_bank_transaction($trans_type, $trans_no, $from_account, $items, $date_, + $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 != ST_BANKPAYMENT && $trans_type != ST_BANKDEPOSIT) + display_db_error("Invalid type ($trans_type) sent to add_bank_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); + + // the gl items are already inversed/negated for type 2 (deposit) + $total_amount = $items->gl_items_total(); + + if ($person_type_id == PT_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_); + // we need to negate it too + $cust_amount = -$cust_amount; + + $trans_no = reinsert_customer_trans($trans_type, $trans_no, $person_id, $person_detail_id, $date_, + $ref, $cust_amount); + + } + elseif ($person_type_id == PT_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 + $supp_amount = -$supp_amount; + + $trans_no = reinsert_supp_trans($trans_type, $trans_no, $person_id, $date_, '', + $ref, "", $supp_amount, 0, 0); + + } + else + { + $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_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 == 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", ""); + } + + // do the destination account postings + $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) + { + 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) + { + add_exchange_variation($trans_no1, $date_, $is_bank_to, $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_); + } + // 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); + + 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_); + + $Refs->save($trans_type, $trans_no, $ref); + add_audit_trail($trans_type, $trans_no, $date_); + + if ($use_transaction) + commit_transaction(); return array($trans_type, $trans_no); }