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=3bd65e23b974270983b1dcb6e2c6e0c474951434;hpb=80fb82524d1ccfeec8d13e85092408b79196490a;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 3bd65e23..c3725611 100644
--- a/gl/includes/db/gl_db_bank_trans.inc
+++ b/gl/includes/db/gl_db_bank_trans.inc
@@ -65,18 +65,27 @@ function exists_bank_trans($type, $type_no)
 
 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
-		FROM ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts
-		WHERE ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
+	$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 ($type != null)
-		$sql .= " AND type=".db_escape($type);
+		$sql .= " AND bt.type=".db_escape($type);
 	if ($trans_no != null)
-		$sql .= " AND ".TB_PREF."bank_trans.trans_no = ".db_escape($trans_no);
+		$sql .= " AND bt.trans_no = ".db_escape($trans_no);
 	if ($person_type_id != null)
-		$sql .= " AND ".TB_PREF."bank_trans.person_type_id = ".db_escape($person_type_id);
+		$sql .= " AND bt.person_type_id = ".db_escape($person_type_id);
 	if ($person_id != null)
-		$sql .= " AND ".TB_PREF."bank_trans.person_id = ".db_escape($person_id);
-	$sql .= " ORDER BY trans_date, ".TB_PREF."bank_trans.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");
 }
@@ -93,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");
@@ -168,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;
 
@@ -186,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;
@@ -206,4 +219,3 @@ function check_void_bank_trans($type, $type_no)
 	return true;
 }
 
-?>