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";
* 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) 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;