X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_banking.inc;h=e6d65d92d79af69f56869e2b806c9b182de42700;hb=1466764d49233238c6097c95341875be552d7487;hp=6cfe49203ceeb5eeba193fea86841173cbb54636;hpb=b9fc3611d1d90d06499ea0d77ef21f1a2835f14b;p=fa-stable.git diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc index 6cfe4920..e6d65d92 100644 --- a/gl/includes/db/gl_db_banking.inc +++ b/gl/includes/db/gl_db_banking.inc @@ -35,7 +35,7 @@ function add_exchange_variation($trans_no, $date_, $acc_id, $account, } $amount = get_gl_trans_from_to("", $date_, $account); $diff = $amount - $for_amount; - if ($diff != 0) + if (floatcmp($diff,0)) { if ($trans_no == null) $trans_no = get_next_trans_no(ST_JOURNAL); @@ -45,8 +45,9 @@ function add_exchange_variation($trans_no, $date_, $acc_id, $account, -$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 true; } - return ($diff != 0); + return false; } //------------- New helper functions for revaluation of customer/supplier currencies 2011-05-08 Joe Hunt. @@ -190,14 +191,14 @@ function add_exchange_variation_all($date=null, $ref="", $memo) // function add_bank_transfer($from_account, $to_account, $date_, - $amount, $ref, $memo_, $charge=0) + $amount, $ref, $memo_, $charge=0, $target_amount=0) { global $Refs, $SysPrefs; begin_transaction(); - $args = func_get_args(); if (count($args) < 7) $args[] = 0; + $args = func_get_args(); if (count($args) < 8) $args[] = 0; $args = (object)array_combine(array('from_account', 'to_account', 'date_', 'amount', - 'ref', 'memo_', 'charge'), $args); + 'ref', 'memo_', 'charge', 'target_amount'), $args); $args->trans_no = 0; hook_db_prewrite($args, ST_BANKTRANSFER); @@ -238,16 +239,25 @@ function add_bank_transfer($from_account, $to_account, $date_, $total += add_gl_trans($trans_type, $trans_no, $date_, $charge_act, 0, 0, $person_id, $charge, $currency); } + + // provide backward compatibility for extension modules (target amount can be not passed) + $to_currency = $target_amount ? $toact['bank_curr_code'] : $currency; + $to_amount = $target_amount ? $target_amount : $amount; + // do the destination account postings $total += add_gl_trans($trans_type, $trans_no, $date_, $to_gl_account, 0, 0, $person_id, - $amount, $currency); + $to_amount, $to_currency); /*Post a balance post if $total != 0 */ - add_gl_balance($trans_type, $trans_no, $date_, -$total); + if ($currency == $to_currency) + add_gl_balance($trans_type, $trans_no, $date_, -$total); + else // in this case those are exchange variances between bank and home rates + add_gl_trans($trans_type, $trans_no, $date_, get_company_pref('exchange_diff_act'), + 0, 0, _("Exchange Variance"), -$total); add_bank_trans($trans_type, $trans_no, $to_account, $ref, - $date_, $amount, PT_MISC, $person_id, - $currency, "Cannot insert a destination bank transaction"); + $date_, $to_amount, PT_MISC, $person_id, + $to_currency, "Cannot insert a destination bank transaction"); if ($SysPrefs->auto_currency_revaluation()) { @@ -278,17 +288,18 @@ function add_bank_transfer($from_account, $to_account, $date_, // Add bank payment or deposit to database. // // $from_account - bank account id -// $item - transaction cart (line item's amounts in bank account's currency) +// $items - transaction cart (line amounts in bank account's currency); negative for deposit // $person_type_id - defines type of $person_id identifiers // $person_id - supplier/customer/other id -// $person_detail_id - customer branch id or not used +// $person_detail_id - customer branch id or not used +// $settled_amount - settled amount in AR/AP (if applicable) in customer/supplier currency (always non-negative number) // // returns an array of (inserted trans type, trans no) // // FIXME -revise code for update case // function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $date_, - $person_type_id, $person_id, $person_detail_id, $ref, $memo_, $use_transaction=true) + $person_type_id, $person_id, $person_detail_id, $ref, $memo_, $use_transaction=true, $settled_amount=null) { global $Refs, $SysPrefs; @@ -303,12 +314,15 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $ $args = func_get_args(); if (count($args) < 11) $args[] = true; $args = (object)array_combine(array('trans_type', 'trans_no', 'from_account', 'items', 'date_', - 'person_type_id', 'person_id', 'person_detail_id', 'ref', 'memo_', 'use_transaction'), + 'person_type_id', 'person_id', 'person_detail_id', 'ref', 'memo_', 'use_transaction', 'settled_amount'), $args); hook_db_prewrite($args, $trans_type); - - if ($trans_no) - clear_bank_transaction($_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id); + $aid = 0; + if ($trans_no) { + $old_trans = $trans_no; + $Refs->restore_last($trans_type, $trans_no); + $aid = has_attachment($trans_type, $trans_no); + } $currency = get_bank_account_currency($from_account); $bank_gl_account = get_bank_gl_account($from_account); @@ -319,13 +333,16 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $ 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; + if (!isset($settled_amount)) // leaved for backward/ext compatibility + $cust_amount = exchange_from_to(abs($total_amount), $currency, get_customer_currency($person_id), $date_); + else + $cust_amount = $settled_amount; + + if ($trans_type == ST_BANKPAYMENT) + $cust_amount = -$cust_amount; - $trans_no = write_customer_trans($trans_type, $trans_no, $person_id, $person_detail_id, $date_, + $trans_no = write_customer_trans($trans_type, 0, $person_id, $person_detail_id, $date_, $ref, $cust_amount); } @@ -333,24 +350,31 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $ { // 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_); + if (!isset($settled_amount)) // leaved for for backward/ext compatibility + $supp_amount = exchange_from_to(abs($total_amount), $currency, get_supplier_currency($person_id), $date_); + else + $supp_amount = $settled_amount; - // we need to negate it too - $supp_amount = -$supp_amount; + if ($trans_type == ST_BANKPAYMENT) + $supp_amount = -$supp_amount; - $trans_no = write_supp_trans($trans_type, $trans_no, $person_id, $date_, '', + $trans_no = write_supp_trans($trans_type, 0, $person_id, $date_, '', $ref, "", $supp_amount, 0, 0); } else { - if (!$trans_no) - $trans_no = get_next_trans_no($trans_type); + $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); } - + if ($aid != 0) + { + $row = get_attachment($aid); + update_attachment($aid, $row['type_no'], $trans_no, $row['description'], + $row['filename'], $row['unique_name'], $row['filesize'], $row['filetype']); + } // do the source account postings add_bank_trans($trans_type, $trans_no, $from_account, $ref, @@ -384,13 +408,13 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $ { 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_); } @@ -403,11 +427,11 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $ { 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_); @@ -415,6 +439,11 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $ $Refs->save($trans_type, $trans_no, $ref); add_audit_trail($trans_type, $trans_no, $date_); + // old transaction can be voided only after new transaction is entered, + // otherwise the operation could fail for cash accounts due to temporary negative balance + if (@$old_trans) + void_transaction($trans_type, $old_trans, Today(), _("Document reentered.")); + $args->trans_no = $trans_no; hook_db_postwrite($args, $trans_type); if ($use_transaction) @@ -422,30 +451,5 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $ return array($trans_type, $trans_no); } -//---------------------------------------------------------------------------------------- - -function clear_bank_transaction($type, $type_no) -{ - - hook_db_prevoid($type, $type_no); - - $sql = "DELETE FROM ".TB_PREF."bank_trans - WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no); - - $result = db_query($sql, "could not clear bank transactions for type=$type and trans_no=$type_no"); - - clear_gl_trans($type, $type_no, true); - - // in case it's a customer trans - probably better to check first - void_cust_allocations($type, $type_no); - - // in case it's a supplier trans - probably better to check first - void_supp_allocations($type, $type_no); - clear_supp_trans($type, $type_no); - - clear_trans_tax_details($type, $type_no); - - delete_comments($type, $type_no); -} ?> \ No newline at end of file