Global fixes in SQL queries aimed to make them more readible and easier for maintence.

[fa-stable.git] / gl / includes / db / gl_db_bank_trans.inc

diff --git a/gl/includes/db/gl_db_bank_trans.inc b/gl/includes/db/gl_db_bank_trans.inc
index c37256111028535fdfec181591aa94938d40eec0..e0dbdf287f21ac8f374e6afc9b3c8024cf86e7f8 100644 (file)
--- a/gl/includes/db/gl_db_bank_trans.inc
+++ b/gl/includes/db/gl_db_bank_trans.inc
@@ -54,7 +54,9 @@ function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_,
 
 function exists_bank_trans($type, $type_no)
 {
-       $sql = "SELECT trans_no FROM ".TB_PREF."bank_trans WHERE type=".db_escape($type)
+       $sql = "SELECT trans_no
+               FROM ".TB_PREF."bank_trans
+               WHERE type=".db_escape($type)
                ." AND trans_no=".db_escape($type_no);
        $result = db_query($sql, "Cannot retreive a bank transaction");
 
@@ -96,13 +98,14 @@ function get_bank_trans_for_bank_account($bank_account, $from, $to)
 {
        $from = date2sql($from);
        $to = date2sql($to);
-       $sql = "SELECT t.* FROM "
-               .TB_PREF."bank_trans t LEFT JOIN ".TB_PREF."voided v ON t.type=v.type AND t.trans_no=v.id
+       $sql = "SELECT t.* 
+               FROM ".TB_PREF."bank_trans t 
+                       LEFT JOIN ".TB_PREF."voided v ON t.type=v.type AND t.trans_no=v.id
                WHERE t.bank_act = ".db_escape($bank_account) . "
-               AND ISNULL(v.date_)
-               AND trans_date >= '$from'
-               AND trans_date <= '$to'
-               AND amount != 0
+                       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");
@@ -113,9 +116,10 @@ function get_bank_trans_for_bank_account($bank_account, $from, $to)
 function get_balance_before_for_bank_account($bank_account, $from)
 {
        $from = date2sql($from);
-       $sql = "SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE bank_act="
-               .db_escape($bank_account) . "
-               AND trans_date < '$from'";
+       $sql = "SELECT SUM(amount)
+               FROM ".TB_PREF."bank_trans
+               WHERE bank_act=".db_escape($bank_account) . "
+                       AND trans_date < '$from'";
        $before_qty = db_query($sql, "The starting balance on hand could not be calculated");
        $bfw_row = db_fetch_row($before_qty);
        return $bfw_row[0];
@@ -124,9 +128,11 @@ function get_balance_before_for_bank_account($bank_account, $from)
 
 function get_gl_trans_value($account, $type, $trans_no)
 {
-       $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE account="
-       .db_escape($account)." AND type=".db_escape($type)
-       ." AND type_no=".db_escape($trans_no);
+       $sql = "SELECT SUM(amount)
+               FROM ".TB_PREF."gl_trans
+               WHERE account=".db_escape($account)
+                       ." AND type=".db_escape($type)
+                       ." AND type_no=".db_escape($trans_no);
 
        $result = db_query($sql, "query for gl trans value");
 
@@ -142,8 +148,9 @@ function void_bank_trans($type, $type_no, $nested=false)
        if (!$nested)
                begin_transaction();
 
-       $sql = "UPDATE ".TB_PREF."bank_trans SET amount=0
-               WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
+       $sql = "UPDATE ".TB_PREF."bank_trans 
+                       SET amount=0
+                       WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
 
        $result = db_query($sql, "could not void bank transactions for type=$type and trans_no=$type_no");
 
@@ -183,7 +190,9 @@ function check_bank_account_history($delta_amount, $bank_account, $date=null, $u
 
        $balance += $delta_amount;
 
-       $sql = "SELECT sum(amount) as amount, trans_date FROM ".TB_PREF."bank_trans WHERE bank_act=".db_escape($bank_account);
+       $sql = "SELECT sum(amount) as amount, trans_date
+                       FROM ".TB_PREF."bank_trans
+                       WHERE bank_act=".db_escape($bank_account);
        if ($date)
        {
                $date = date2sql($date);