X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_bank_trans.inc;h=c37256111028535fdfec181591aa94938d40eec0;hb=9451db1760036985de791ba24c442801e37f37de;hp=f88801526b63b82531213861d15b60ebe8098eb5;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;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 f8880152..c3725611 100644
--- a/gl/includes/db/gl_db_bank_trans.inc
+++ b/gl/includes/db/gl_db_bank_trans.inc
@@ -102,6 +102,7 @@ function get_bank_trans_for_bank_account($bank_account, $from, $to)
 		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");
@@ -177,8 +178,8 @@ function check_bank_account_history($delta_amount, $bank_account, $date=null, $u
 	if (!isset($balance) && isset($date))
 		return null;	// unlimited account
 
-	if ($balance < -$delta_amount)
-		return array('amount' => $balance, 'trans_date'=> $date);
+	if (floatcmp($balance, -$delta_amount) < 0)
+		return array('amount' => $balance + $delta_amount, 'trans_date'=> date2sql($date));
 
 	$balance += $delta_amount;
 
@@ -195,7 +196,10 @@ function check_bank_account_history($delta_amount, $bank_account, $date=null, $u
 	while ($trans = db_fetch($history)) {
 		$balance += $trans['amount'];
 		if ($balance < 0)
+		{
+			$trans['amount'] = $balance;
 			return $trans;
+		}
 	}
 
 	return null;
@@ -215,4 +219,3 @@ function check_void_bank_trans($type, $type_no)
 	return true;
 }
 
-?>