{
$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");
}
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);