X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_bank_accounts.inc;h=ee535be7b1eb75302ada063dfc76931d3f89a305;hb=2f3375b4493c1b1e0b17c2801298275f22f8d76e;hp=01c6067507886ba601898c26b9b4193d2711de5c;hpb=9bfa65240d069737c719bdbc472b870414baeeae;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_bank_accounts.inc b/gl/includes/db/gl_db_bank_accounts.inc
index 01c60675..ee535be7 100644
--- a/gl/includes/db/gl_db_bank_accounts.inc
+++ b/gl/includes/db/gl_db_bank_accounts.inc
@@ -277,13 +277,15 @@ function get_ending_reconciled($bank_account, $bank_date)
 
 function get_sql_for_bank_account_reconcile($bank_account, $date)
 {
-	$sql = "SELECT	type, trans_no, ref, trans_date,
-				amount,	person_id, person_type_id, reconciled, id
-		FROM ".TB_PREF."bank_trans
+	$sql = "SELECT	bt.type, trans_no, ref, trans_date,
+				amount,	person_id, person_type_id, reconciled, bt.id, c.memo_
+		FROM ".TB_PREF."bank_trans bt
+		LEFT JOIN ".TB_PREF."comments c ON c.type = bt.type AND c.id = bt.trans_no
 		WHERE bank_act = ".db_escape($bank_account) . "
 			AND (reconciled IS NULL OR reconciled='". date2sql($date) ."')
 			AND amount != 0
-		ORDER BY trans_date, id";
+		ORDER BY trans_date, bt.id";
+
 	return $sql;
 }
 
@@ -342,8 +344,8 @@ function get_default_supplier_bank_account($supplier_id)
 	$sql = "SELECT curr_code FROM ".TB_PREF."suppliers WHERE supplier_id=".db_escape($supplier_id);
 	$result = db_query($sql, "could not retreive default supplier currency code");
 	$row = db_fetch_row($result);
-	$ba = get_default_bank_account($row[0]);
-	return $ba['id'];
+	$id = $row ? get_default_bank_account($row[0])['id'] : 0;
+	return $id;
 }
 //---------------------------------------------------------------------------------------------
 //