X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_bank_trans.inc;h=8c63f64573bf3bdfd5ac7f1f1e76a22d7177c5d4;hb=a3905612a65008c52315b9951010b0bef88c63cb;hp=804e94ac6ee806c1b28dc8c7a0d5750c03bdef89;hpb=97023f8706bb7149c62ca49eaec123cca3c51fa0;p=fa-stable.git diff --git a/gl/includes/db/gl_db_bank_trans.inc b/gl/includes/db/gl_db_bank_trans.inc index 804e94ac..8c63f645 100644 --- a/gl/includes/db/gl_db_bank_trans.inc +++ b/gl/includes/db/gl_db_bank_trans.inc @@ -1,82 +1,138 @@ . +***********************************************************************/ //---------------------------------------------------------------------------------- // add a bank transaction // $amount is in $currency // $date_ is display date (non-sql) -function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_, $bank_trans_type_id, - $amount, $person_type_id, $person_id, $currency="", $err_msg="") +function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_, + $amount, $person_type_id, $person_id, $currency="", $err_msg="", $rate=0) { $sqlDate = date2sql($date_); - + // convert $amount to the bank's currency - if ($currency != "") + if ($currency != "") { $bank_account_currency = get_bank_account_currency($bank_act); - $to_bank_currency = get_exchange_rate_from_to($currency, $bank_account_currency, $date_); + if ($rate == 0) + $to_bank_currency = get_exchange_rate_from_to($currency, $bank_account_currency, $date_); + else + $to_bank_currency = 1 / $rate; $amount_bank = ($amount / $to_bank_currency); - } + } else - $amount_bank = $amount; - - - // Also store the rate to the home - //$BankToHomeCurrencyRate = get_exchange_rate_to_home_currency($bank_account_currency, $date_); - - $sql = "INSERT INTO ".TB_PREF."bank_trans (type, trans_no, bank_act, ref, - trans_date, bank_trans_type_id, amount, person_type_id, person_id) "; - - $sql .= "VALUES ($type, $trans_no, '$bank_act', '$ref', '$sqlDate', '$bank_trans_type_id', - $amount_bank, $person_type_id, '$person_id')"; - + $amount_bank = $amount; + $amount_bank = round2($amount_bank, user_price_dec()); + + $sql = "INSERT INTO ".TB_PREF."bank_trans (type, trans_no, bank_act, ref, + trans_date, amount, person_type_id, person_id) "; + + $sql .= "VALUES ($type, $trans_no, '$bank_act', ".db_escape($ref).", '$sqlDate', + ".db_escape($amount_bank).", ".db_escape($person_type_id) + .", ". db_escape($person_id).")"; + if ($err_msg == "") $err_msg = "The bank transaction could not be inserted"; - - db_query($sql, $err_msg); + + db_query($sql, $err_msg); } //---------------------------------------------------------------------------------------- function exists_bank_trans($type, $type_no) { - $sql = "SELECT trans_no FROM ".TB_PREF."bank_trans WHERE type=$type - AND trans_no=$type_no"; - $result = db_query($sql, "Cannot retreive a bank transaction"); - - return (db_num_rows($result) > 0); + $sql = "SELECT trans_no + FROM ".TB_PREF."bank_trans + WHERE type=".db_escape($type) + ." AND trans_no=".db_escape($type_no); + $result = db_query($sql, "Cannot retreive a bank transaction"); + + return (db_num_rows($result) > 0); } //---------------------------------------------------------------------------------------- function get_bank_trans($type, $trans_no=null, $person_type_id=null, $person_id=null) { - $sql = "SELECT *, bank_account_name, account_code, bank_curr_code, name AS BankTransType - FROM ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts, ".TB_PREF."bank_trans_types - WHERE ".TB_PREF."bank_trans_types.id = ".TB_PREF."bank_trans.bank_trans_type_id - AND ".TB_PREF."bank_accounts.account_code=".TB_PREF."bank_trans.bank_act "; - if ($type != null) - $sql .= " AND type=$type "; - if ($trans_no != null) - $sql .= " AND ".TB_PREF."bank_trans.trans_no = $trans_no "; - if ($person_type_id != null) - $sql .= " AND ".TB_PREF."bank_trans.person_type_id = $person_type_id "; - if ($person_id != null) - $sql .= " AND ".TB_PREF."bank_trans.person_id = '$person_id'"; - $sql .= " ORDER BY trans_date, ".TB_PREF."bank_trans.id"; - + $sql = "SELECT bt.*, act.*, + IFNULL(abs(dt.ov_amount), IFNULL(ABS(st.ov_amount), bt.amount)) settled_amount, + IFNULL(abs(dt.ov_amount/bt.amount), IFNULL(ABS(st.ov_amount/bt.amount), 1)) settle_rate, + IFNULL(debtor.curr_code, IFNULL(supplier.curr_code, act.bank_curr_code)) settle_curr + + FROM ".TB_PREF."bank_trans bt + LEFT JOIN ".TB_PREF."debtor_trans dt ON dt.type=bt.type AND dt.trans_no=bt.trans_no + LEFT JOIN ".TB_PREF."debtors_master debtor ON debtor.debtor_no = dt.debtor_no + LEFT JOIN ".TB_PREF."supp_trans st ON st.type=bt.type AND st.trans_no=bt.trans_no + LEFT JOIN ".TB_PREF."suppliers supplier ON supplier.supplier_id = st.supplier_id, + ".TB_PREF."bank_accounts act + WHERE act.id=bt.bank_act "; + if (isset($type)) + $sql .= " AND bt.type=".db_escape($type); + if (isset($trans_no)) + $sql .= " AND bt.trans_no = ".db_escape($trans_no); + if (isset($person_type_id)) + $sql .= " AND bt.person_type_id = ".db_escape($person_type_id); + if (isset($person_id)) + $sql .= " AND bt.person_id = ".db_escape($person_id); + $sql .= " ORDER BY trans_date, bt.id"; + return db_query($sql, "query for bank transaction"); } //---------------------------------------------------------------------------------------- +function get_bank_trans_for_bank_account($bank_account, $from, $to) +{ + $from = date2sql($from); + $to = date2sql($to); + $sql = "SELECT t.* + FROM ".TB_PREF."bank_trans t + LEFT JOIN ".TB_PREF."voided v ON t.type=v.type AND t.trans_no=v.id + WHERE t.bank_act = ".db_escape($bank_account) . " + AND ISNULL(v.date_) + AND trans_date >= '$from' + AND trans_date <= '$to' + AND amount != 0 + ORDER BY trans_date, t.id"; + + return db_query($sql,"The transactions for '" . $bank_account . "' could not be retrieved"); +} + +//---------------------------------------------------------------------------------------- + +function get_balance_before_for_bank_account($bank_account, $from) +{ + $from = date2sql($from); + $sql = "SELECT SUM(amount) + FROM ".TB_PREF."bank_trans + WHERE bank_act=".db_escape($bank_account) . " + AND trans_date < '$from'"; + $before_qty = db_query($sql, "The starting balance on hand could not be calculated"); + $bfw_row = db_fetch_row($before_qty); + return $bfw_row[0]; +} +//---------------------------------------------------------------------------------------- + function get_gl_trans_value($account, $type, $trans_no) { - $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE account='$account' AND type=$type AND type_no=$trans_no"; - + $sql = "SELECT SUM(amount) + FROM ".TB_PREF."gl_trans + WHERE account=".db_escape($account) + ." AND type=".db_escape($type) + ." AND type_no=".db_escape($trans_no); + $result = db_query($sql, "query for gl trans value"); - + $row = db_fetch_row($result); return $row[0]; } @@ -85,28 +141,88 @@ function get_gl_trans_value($account, $type, $trans_no) function void_bank_trans($type, $type_no, $nested=false) { + if (!$nested) begin_transaction(); - - $sql = "UPDATE ".TB_PREF."bank_trans SET amount=0 - WHERE type=$type AND trans_no=$type_no"; - - $result = db_query($sql, "could not void bank transactions for type=$type and trans_no=$type_no"); - + + $sql = "UPDATE ".TB_PREF."bank_trans + SET amount=0 + WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no); + + db_query($sql, "could not void bank transactions for type=$type and trans_no=$type_no"); + void_gl_trans($type, $type_no, true); - + // in case it's a customer trans - probably better to check first void_cust_allocations($type, $type_no); void_customer_trans($type, $type_no); - + // in case it's a supplier trans - probably better to check first void_supp_allocations($type, $type_no); void_supp_trans($type, $type_no); - + + void_trans_tax_details($type, $type_no); + if (!$nested) commit_transaction(); } -//---------------------------------------------------------------------------------- +/** +* Check account history to find transaction which would exceed authorized overdraft for given account. +* Returns null or transaction in conflict. Running balance is checked on daily basis only, to enable ID change after edition. +* $delta_amount - tested change in bank balance at $date. +**/ +function check_bank_account_history($delta_amount, $bank_account, $date=null, $user=null, $balance_offset = 0) +{ + if ($delta_amount >= 0 && isset($date)) + return null; // amount increase is always safe + + $balance = $date ? get_bank_account_limit($bank_account, $date, $user) : 0; + + if (!isset($balance) && isset($date)) + return null; // unlimited account + + $balance += $balance_offset; + if (floatcmp($balance, -$delta_amount) < 0) + return array('amount' => $balance + $delta_amount, 'trans_date'=> date2sql($date)); + + $balance += $delta_amount; + + $sql = "SELECT sum(amount) as amount, trans_date, trans_no, type + FROM ".TB_PREF."bank_trans + WHERE bank_act=".db_escape($bank_account); + if ($date) + { + $date = date2sql($date); + $sql .= " AND trans_date > '$date'"; + } + $sql .= " GROUP BY trans_date ORDER BY trans_date ASC"; + + $history = db_query($sql, "cannot retrieve cash account history"); + + while ($trans = db_fetch($history)) { + $balance += $trans['amount']; + if (round2($balance, user_price_dec()) < 0) + { + $trans['amount'] = $balance; + return $trans; + } + } + + return null; +} + +/** +* Check bank transfer, deposit or customer deposit before voiding. +**/ +function check_void_bank_trans($type, $type_no) +{ + $moves = get_bank_trans($type, $type_no); + while ($trans = db_fetch($moves)) { + if ($trans['amount'] > 0) { // skip transfer input part + return check_bank_account_history(-$trans['amount'], $trans['bank_act'], sql2date($trans['trans_date'])) == null; + } + } + return true; +} -?> \ No newline at end of file