X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_bank_trans.inc;h=62900fc3ddeaac1bea4004b40047526eb3f406a9;hb=a84031edf2c09459a446d896191e27907d8cb188;hp=49c1c9ff599604362845a4e92fa4e0535dc8ebe1;hpb=327bdb5d6f9a11274f0bedd20e6c9d39276a5f8f;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 49c1c9ff..62900fc3 100644
--- a/gl/includes/db/gl_db_bank_trans.inc
+++ b/gl/includes/db/gl_db_bank_trans.inc
@@ -66,9 +66,9 @@ function exists_bank_trans($type, $type_no)
 function get_bank_trans($type, $trans_no=null, $person_type_id=null, $person_id=null)
 {
 	$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
+		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
@@ -177,8 +177,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'=> $date);
 
 	$balance += $delta_amount;