X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=dimensions%2Fincludes%2Fdimensions_db.inc;h=13c91fd41c3956ad194114d386f95cc1013b9dfa;hb=df660a601cabb0afe7f3246884f16207b9a0c314;hp=157000737efbf3b078919a241f6dc057fe078e2c;hpb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;p=fa-stable.git

diff --git a/dimensions/includes/dimensions_db.inc b/dimensions/includes/dimensions_db.inc
index 15700073..13c91fd4 100644
--- a/dimensions/includes/dimensions_db.inc
+++ b/dimensions/includes/dimensions_db.inc
@@ -157,11 +157,14 @@ function get_dimension_balance_all($id, $from, $to)
 {
 	$from = date2sql($from);
 	$to = date2sql($to);
-	$sql = "SELECT account, ".TB_PREF."chart_master.account_name, sum(amount) AS amt FROM
-		".TB_PREF."gl_trans,".TB_PREF."chart_master WHERE
-		".TB_PREF."gl_trans.account = ".TB_PREF."chart_master.account_code AND
-		(dimension_id = ".db_escape($id)." OR dimension2_id = ".db_escape($id).") AND
-		tran_date >= '$from' AND tran_date <= '$to' GROUP BY account";
+	$sql = "SELECT account, coa.account_name, sum(amount) AS amt 
+		FROM "
+		.TB_PREF."gl_trans trans,"
+		.TB_PREF."chart_master coa
+		WHERE
+			trans.account = coa.account_code
+		AND	(dimension_id = ".db_escape($id)." OR dimension2_id = ".db_escape($id).")
+		AND	tran_date >= '$from' AND tran_date <= '$to' GROUP BY account";
 	return db_query($sql, "Transactions could not be calculated");
 }
 
@@ -170,9 +173,12 @@ function get_dimension_balance_all($id, $from, $to)
 function get_dimension_balance($id, $from, $to) 
 {
 	$id = db_escape($id);
-	$sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE tran_date >= '" .
-		date2sql($from) . "' AND
-		tran_date <= '" . date2sql($to) . "' AND (dimension_id = $id OR dimension2_id = $id)";
+	$sql = "SELECT SUM(amount)
+			FROM ".TB_PREF."gl_trans 
+			WHERE
+				tran_date >= '" .	date2sql($from) . "' 
+			AND	tran_date <= '" . date2sql($to) . "' 
+			AND (dimension_id = $id OR dimension2_id = $id)";
 	$res = db_query($sql, "Sum of transactions could not be calculated");
 	$row = db_fetch_row($res);