// $date_ is display date (non-sql)
function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_,
- $amount, $person_type_id, $person_id, $currency="", $err_msg="", $rate=0)
+ $amount, $charge=0, $person_type_id=0, $person_id=0, $currency="", $rate=0)
{
$sqlDate = date2sql($date_);
$amount_bank = $amount;
$amount_bank = round2($amount_bank, user_price_dec());
- // 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, amount, person_type_id, person_id) ";
+ trans_date, amount, charge, 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($amount_bank).", ".db_escape($charge).", ".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, "The bank transaction could not be inserted");
}
//----------------------------------------------------------------------------------------
$sql = "SELECT trans_no
FROM ".TB_PREF."bank_trans
WHERE type=".db_escape($type)
- ." AND trans_no=".db_escape($type_no);
+ ." AND trans_no=".db_escape($type_no)
+ ." AND (amount!=0 OR charge!=0)";
$result = db_query($sql, "Cannot retreive a bank transaction");
return (db_num_rows($result) > 0);
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 ($type != null)
+ if (isset($type))
$sql .= " AND bt.type=".db_escape($type);
- if ($trans_no != null)
+ if (isset($trans_no))
$sql .= " AND bt.trans_no = ".db_escape($trans_no);
- if ($person_type_id != null)
+ if (isset($person_type_id))
$sql .= " AND bt.person_type_id = ".db_escape($person_type_id);
- if ($person_id != null)
+ if (isset($person_id))
$sql .= " AND bt.person_id = ".db_escape($person_id);
$sql .= " ORDER BY trans_date, bt.id";
AND ISNULL(v.date_)
AND trans_date >= '$from'
AND trans_date <= '$to'
- AND amount != 0
+ AND (amount != 0 OR charge != 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)
+ $sql = "SELECT SUM(amount+charge)
FROM ".TB_PREF."bank_trans
WHERE bank_act=".db_escape($bank_account) . "
AND trans_date < '$from'";
{
if (!$nested)
- begin_transaction();
+ begin_transaction(__FUNCTION__, func_get_args());
$sql = "UPDATE ".TB_PREF."bank_trans
- SET amount=0
+ SET amount=0, charge=0
WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
- $result = db_query($sql, "could not void bank transactions for type=$type and trans_no=$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);
* 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)
+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 increese is always safe
+ 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
+ $sql = "SELECT SUM(amount+charge) as amount, trans_date, trans_no, type
FROM ".TB_PREF."bank_trans
WHERE bank_act=".db_escape($bank_account);
if ($date)
while ($trans = db_fetch($history)) {
$balance += $trans['amount'];
- if ($balance < 0)
+ if (round2($balance, user_price_dec()) < 0)
{
$trans['amount'] = $balance;
return $trans;
$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 check_bank_account_history(-$trans['amount']-$trans['charge'], $trans['bank_act'], sql2date($trans['trans_date'])) == null;
}
}
return true;
}
+function update_reconcile_date($type, $trans_no, $date=NULL)
+{
+ $sql = "UPDATE ".TB_PREF."bank_trans SET reconciled=".($date ? "'".date2sql($date)."'" : 'NULL')
+ ." WHERE type=" . db_escape($type). " AND trans_no=".db_escape($trans_no);
+
+ db_query($sql, "Can't change reconciliation status");
+}