Improved journal trans: added currency support, tax and source document date. Allowed...
[fa-stable.git] / gl / includes / db / gl_db_trans.inc
index fe71fb2d4907110a4435d7dcbbf28f812ff9f1e0..d42bd73263a5baefe43cfcca0f233a850695a858 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 //--------------------------------------------------------------------------------
 
 // Base function for adding a GL transaction
 // if $currency is not set, then defaults to no conversion
 
 function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension2, $memo_,
-       $amount, $currency=null, $person_type_id=null, $person_id=null, $err_msg="")
+       $amount, $currency=null, $person_type_id=null, $person_id=null, $err_msg="", $rate=0)
 {
-       global $use_audit_trail;
-       
+       global $SysPrefs;
+
        $date = date2sql($date_);
        if ($currency != null)
-               $amount_in_home_currency = to_home_currency($amount, $currency, $date_);
+       {
+               if ($rate == 0)
+                       $amount_in_home_currency = to_home_currency($amount, $currency, $date_);
+               else
+                       $amount_in_home_currency = round2($amount * $rate,  user_price_dec());
+       }               
        else
-               $amount_in_home_currency = $amount;
+               $amount_in_home_currency = round2($amount, user_price_dec());
        if ($dimension == null || $dimension < 0)
                $dimension = 0;
        if ($dimension2 == null || $dimension2 < 0)
                $dimension2 = 0;
-       if (isset($use_audit_trail) && $use_audit_trail)
+       if (isset($SysPrefs->use_audit_trail) && $SysPrefs->use_audit_trail)
        {
                if ($memo_ == "" || $memo_ == null)
                        $memo_ = $_SESSION["wa_current_user"]->username;
                else
                        $memo_ = $_SESSION["wa_current_user"]->username . " - " . $memo_;
-       }               
+       }
+       if (!is_subledger_account($account) || $account==get_company_pref('grn_clearing_act'))
+               $person_id = $person_type_id = null;
+
        $sql = "INSERT INTO ".TB_PREF."gl_trans ( type, type_no, tran_date,
                account, dimension_id, dimension2_id, memo_, amount";
 
@@ -36,18 +53,21 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
 
        $sql .= ") ";
 
-       $sql .= "VALUES ($type, $trans_id, '$date',
-               $account, $dimension, $dimension2, '$memo_', $amount_in_home_currency";
+       $sql .= "VALUES (".db_escape($type).", ".db_escape($trans_id).", '$date',
+               ".db_escape($account).", ".db_escape($dimension).", "
+               .db_escape($dimension2).", ".db_escape($memo_).", "
+               .db_escape($amount_in_home_currency);
 
        if ($person_type_id != null)
-               $sql .= ", $person_type_id, '$person_id'";
+               $sql .= ", ".db_escape($person_type_id).", ". db_escape($person_id);
 
        $sql .= ") ";
 
        if ($err_msg == "")
                $err_msg = "The GL transaction could not be inserted";
 
-       return db_query($sql, $err_msg);
+       db_query($sql, $err_msg);
+       return $amount_in_home_currency;
 }
 
 //--------------------------------------------------------------------------------
@@ -56,44 +76,75 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
 // $date_ is display date (non-sql)
 // $amount is in HOME currency
 
-function add_gl_trans_std_cost($type, $trans_id, $date_, $account, $dimension, $dimension2, 
+function add_gl_trans_std_cost($type, $trans_id, $date_, $account, $dimension, $dimension2,
        $memo_, $amount, $person_type_id=null, $person_id=null, $err_msg="")
 {
        if ($amount != 0)
                return add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension2, $memo_,
                        $amount, null, $person_type_id, $person_id, $err_msg);
        else
-               return null;
+               return 0;
+}
+
+// Function for even out rounding problems
+function add_gl_balance($type, $trans_id, $date_, $amount, $person_type_id=null, $person_id=null)
+{
+       $amount = round2($amount, user_price_dec());
+
+       if (floatcmp($amount, 0))
+       {
+               error_log(sprintf( _("Rounding error %s encountered for trans_type:%s,trans_no:%s"), $amount, $type, $trans_id));
+               return add_gl_trans($type, $trans_id, $date_, get_company_pref('exchange_diff_act'), 0, 0, "",
+                       $amount, null, $person_type_id, $person_id, "The balanced GL transaction could not be inserted");
+       } else
+               return 0;
 }
 
 //--------------------------------------------------------------------------------
 
 function get_gl_transactions($from_date, $to_date, $trans_no=0,
-       $account=null, $dimension=0, $dimension2=0, $filter_type=null)
+       $account=null, $dimension=0, $dimension2=0, $filter_type=null,
+       $amount_min=null, $amount_max=null)
 {
+       global $SysPrefs;
+       
        $from = date2sql($from_date);
        $to = date2sql($to_date);
 
-       $sql = "SELECT ".TB_PREF."gl_trans.*, ".TB_PREF."chart_master.account_name FROM ".TB_PREF."gl_trans, ".TB_PREF."chart_master
-               WHERE ".TB_PREF."chart_master.account_code=".TB_PREF."gl_trans.account
+       $sql = "SELECT ".TB_PREF."gl_trans.*, "
+               .TB_PREF."chart_master.account_name FROM "
+               .TB_PREF."gl_trans
+                       LEFT JOIN ".TB_PREF."voided v ON "
+                       .TB_PREF."gl_trans.type_no=v.id AND v.type=".TB_PREF."gl_trans.type,"
+                       .TB_PREF."chart_master"
+               ." WHERE ".TB_PREF."chart_master.account_code=".TB_PREF."gl_trans.account
+               AND ISNULL(v.date_)
                AND tran_date >= '$from'
                AND tran_date <= '$to'";
+       if (isset($SysPrefs->show_voided_gl_trans) && $SysPrefs->show_voided_gl_trans == 0)
+               $sql .= " AND ".TB_PREF."gl_trans.amount <> 0"; 
        if ($trans_no > 0)
-               $sql .= " AND ".TB_PREF."gl_trans.type_no LIKE '%$trans_no'";
+               $sql .= " AND ".TB_PREF."gl_trans.type_no LIKE ".db_escape('%'.$trans_no);
 
        if ($account != null)
-               $sql .= " AND ".TB_PREF."gl_trans.account = $account";
+               $sql .= " AND ".TB_PREF."gl_trans.account = ".db_escape($account);
 
-       if ($dimension > 0)
-               $sql .= " AND ".TB_PREF."gl_trans.dimension_id = $dimension";
+       if ($dimension != 0)
+               $sql .= " AND ".TB_PREF."gl_trans.dimension_id = ".($dimension<0?0:db_escape($dimension));
 
-       if ($dimension2 > 0)
-               $sql .= " AND ".TB_PREF."gl_trans.dimension2_id = $dimension2";
+       if ($dimension2 != 0)
+               $sql .= " AND ".TB_PREF."gl_trans.dimension2_id = ".($dimension2<0?0:db_escape($dimension2));
 
        if ($filter_type != null AND is_numeric($filter_type))
-               $sql .= " AND ".TB_PREF."gl_trans.type= $filter_type";
+               $sql .= " AND ".TB_PREF."gl_trans.type= ".db_escape($filter_type);
+               
+       if ($amount_min != null)
+               $sql .= " AND ABS(".TB_PREF."gl_trans.amount) >= ABS(".db_escape($amount_min).")";
+       
+       if ($amount_max != null)
+               $sql .= " AND ABS(".TB_PREF."gl_trans.amount) <= ABS(".db_escape($amount_max).")";
 
-       $sql .= " ORDER BY tran_date";
+       $sql .= " ORDER BY tran_date, counter";
 
        return db_query($sql, "The transactions for could not be retrieved");
 }
@@ -103,30 +154,52 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
 
 function get_gl_trans($type, $trans_id)
 {
-       $sql = "SELECT ".TB_PREF."gl_trans.*, ".TB_PREF."chart_master.account_name FROM ".TB_PREF."gl_trans, ".TB_PREF."chart_master
-               WHERE ".TB_PREF."chart_master.account_code=".TB_PREF."gl_trans.account
-               AND ".TB_PREF."gl_trans.type=$type AND ".TB_PREF."gl_trans.type_no=$trans_id";
-
+       $sql = "SELECT gl.*, cm.account_name, IF(ISNULL(refs.reference), '', refs.reference) AS reference FROM "
+               .TB_PREF."gl_trans as gl
+               LEFT JOIN ".TB_PREF."chart_master as cm ON gl.account = cm.account_code
+               LEFT JOIN ".TB_PREF."refs as refs ON (gl.type=refs.type AND gl.type_no=refs.id)"
+               ." WHERE gl.type= ".db_escape($type) 
+               ." AND gl.type_no = ".db_escape($trans_id)
+               ." AND gl.amount <> 0"
+               ." ORDER BY counter";
        return db_query($sql, "The gl transactions could not be retrieved");
 }
 
 //--------------------------------------------------------------------------------
 
+function get_gl_wo_cost_trans($trans_id, $cost_type=-1)
+{
+       $sql = "SELECT costing.*, gl.*, chart.account_name, com.memo_ FROM "
+               .TB_PREF."wo_costing costing, "
+               .TB_PREF."gl_trans gl LEFT JOIN ".TB_PREF."comments com ON gl.type=com.type     AND gl.type_no=com.id,"
+               .TB_PREF."chart_master chart
+               WHERE 
+                       costing.workorder_id=".db_escape($trans_id)
+               ."      AND chart.account_code=gl.account
+                       AND gl.type=costing.trans_type
+                       AND gl.type_no=costing.trans_no";
+       if ($cost_type != -1)
+               $sql .= " AND costing.cost_type=".db_escape($cost_type);
+       $sql .= " AND amount < 0";
+
+       return db_query($sql, "The gl transactions could not be retrieved");
+}
+
 function get_gl_balance_from_to($from_date, $to_date, $account, $dimension=0, $dimension2=0)
 {
        $from = date2sql($from_date);
        $to = date2sql($to_date);
 
     $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans
-               WHERE account='" . $account . "'";
+               WHERE account='$account'";
        if ($from_date != "")
                $sql .= "  AND tran_date > '$from'";
        if ($to_date != "")
                $sql .= "  AND tran_date < '$to'";
-       if ($dimension > 0)
-               $sql .= " AND dimension_id = $dimension";
-       if ($dimension2 > 0)
-               $sql .= " AND dimension2_id = $dimension2";
+       if ($dimension != 0)
+               $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension));
+       if ($dimension2 != 0)
+               $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2));
 
        $result = db_query($sql, "The starting balance for account $account could not be calculated");
 
@@ -142,114 +215,272 @@ function get_gl_trans_from_to($from_date, $to_date, $account, $dimension=0, $dim
        $to = date2sql($to_date);
 
     $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans
-               WHERE account='" . $account . "'";
+               WHERE account='$account'";
        if ($from_date != "")
                $sql .= " AND tran_date >= '$from'";
        if ($to_date != "")
                $sql .= " AND tran_date <= '$to'";
-       if ($dimension > 0)
-               $sql .= " AND dimension_id = $dimension";
-       if ($dimension2 > 0)
-               $sql .= " AND dimension2_id = $dimension2";
+       if ($dimension != 0)
+               $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension));
+       if ($dimension2 != 0)
+               $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2));
 
        $result = db_query($sql, "Transactions for account $account could not be calculated");
 
        $row = db_fetch_row($result);
-       return $row[0];
+       return (float)$row[0];
+}
+
+//----------------------------------------------------------------------------------------------------
+function get_balance($account, $dimension, $dimension2, $from, $to, $from_incl=true, $to_incl=true) 
+{
+       $sql = "SELECT SUM(IF(amount >= 0, amount, 0)) as debit, 
+               SUM(IF(amount < 0, -amount, 0)) as credit, SUM(amount) as balance 
+               FROM ".TB_PREF."gl_trans,".TB_PREF."chart_master,"
+                       .TB_PREF."chart_types, ".TB_PREF."chart_class 
+               WHERE ".TB_PREF."gl_trans.account=".TB_PREF."chart_master.account_code AND "
+               .TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id 
+               AND ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid AND";
+               
+       if ($account != null)
+               $sql .= " account=".db_escape($account)." AND";
+       if ($dimension != 0)
+               $sql .= " dimension_id = ".($dimension<0?0:db_escape($dimension))." AND";
+       if ($dimension2 != 0)
+               $sql .= " dimension2_id = ".($dimension2<0?0:db_escape($dimension2))." AND";
+       $from_date = date2sql($from);
+       if ($from_incl)
+               $sql .= " tran_date >= '$from_date'  AND";
+       else
+               $sql .= " tran_date > IF(ctype>0 AND ctype<".CL_INCOME.", '0000-00-00', '$from_date') AND";
+       $to_date = date2sql($to);
+       if ($to_incl)
+               $sql .= " tran_date <= '$to_date' ";
+       else
+               $sql .= " tran_date < '$to_date' ";
+
+       $result = db_query($sql,"No general ledger accounts were returned");
+
+       return db_fetch($result);
 }
 
 //--------------------------------------------------------------------------------
 
-function get_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, $dimension2=0) 
+function get_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, $dimension2=0)
 {
 
        $from = date2sql($from_date);
        $to = date2sql($to_date);
-       
+
        $sql = "SELECT SUM(amount) FROM ".TB_PREF."budget_trans
-               WHERE account=$account ";
-       if ($from_date != "")   
+               WHERE account=".db_escape($account);
+       if ($from_date != "")
                $sql .= " AND tran_date >= '$from' ";
-       if ($to_date != "")     
+       if ($to_date != "")
                $sql .= " AND tran_date <= '$to' ";
-       if ($dimension > 0)
-               $sql .= " AND dimension_id = $dimension";
-       if ($dimension2 > 0)
-               $sql .= " AND dimension2_id = $dimension2";
+       if ($dimension != 0)
+               $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension));
+       if ($dimension2 != 0)
+               $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2));
        $result = db_query($sql,"No budget accounts were returned");
 
        $row = db_fetch_row($result);
        return $row[0];
 }
+//-------------------------------------------------------------------------------------
 
-//--------------------------------------------------------------------------------
+function exists_gl_budget($date_, $account, $dimension, $dimension2)
+{
+       $sql = "SELECT account FROM ".TB_PREF."budget_trans WHERE account=".db_escape($account)
+       ." AND tran_date='$date_' AND
+               dimension_id=".db_escape($dimension)." AND dimension2_id=".db_escape($dimension2);
+       $result = db_query($sql, "Cannot retreive a gl transaction");
 
-function add_journal_entries($items, $date_, $ref, $reverse, $memo_=null)
+    return (db_num_rows($result) > 0);
+}
+
+function add_update_gl_budget_trans($date_, $account, $dimension, $dimension2, $amount)
 {
-       begin_transaction();
+       $date = date2sql($date_);
 
-       $trans_type = systypes::journal_entry();
-       $trans_id = get_next_trans_no($trans_type);
+       if (exists_gl_budget($date, $account, $dimension, $dimension2))
+               $sql = "UPDATE ".TB_PREF."budget_trans SET amount=".db_escape($amount)
+               ." WHERE account=".db_escape($account)
+               ." AND dimension_id=".db_escape($dimension)
+               ." AND dimension2_id=".db_escape($dimension2)
+               ." AND tran_date='$date'";
+       else
+               $sql = "INSERT INTO ".TB_PREF."budget_trans (tran_date,
+                       account, dimension_id, dimension2_id, amount, memo_) VALUES ('$date',
+                       ".db_escape($account).", ".db_escape($dimension).", "
+                       .db_escape($dimension2).", ".db_escape($amount).", '')";
 
-       foreach ($items as $journal_item) 
-       {
-               $is_bank_to = is_bank_account($journal_item->code_id);
-
-               add_gl_trans($trans_type, $trans_id, $date_, $journal_item->code_id, 
-                       $journal_item->dimension_id, $journal_item->dimension2_id, 
-                       $journal_item->reference, $journal_item->amount);
-       if ($is_bank_to) 
-       {
-               add_bank_trans($trans_type, $trans_id, $journal_item->code_id, $ref, 
-                       $date_, 3, $journal_item->amount,
-                       0, "", get_company_currency(), 
-                       "Cannot insert a destination bank transaction");                                                                
-       }               
+       db_query($sql, "The GL budget transaction could not be saved");
+}
+
+function delete_gl_budget_trans($date_, $account, $dimension, $dimension2)
+{
+       $date = date2sql($date_);
+
+       $sql = "DELETE FROM ".TB_PREF."budget_trans WHERE account=".db_escape($account)
+       ." AND dimension_id=".db_escape($dimension)
+       ." AND dimension2_id=".db_escape($dimension2)
+       ." AND tran_date='$date'";
+       db_query($sql, "The GL budget transaction could not be deleted");
+}
+
+function get_only_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, $dimension2=0)
+{
+
+       $from = date2sql($from_date);
+       $to = date2sql($to_date);
+
+       $sql = "SELECT SUM(amount) FROM ".TB_PREF."budget_trans
+               WHERE account=".db_escape($account)
+               ." AND tran_date >= '$from' AND tran_date <= '$to'
+                AND dimension_id = ".db_escape($dimension)
+                ." AND dimension2_id = ".db_escape($dimension2);
+       $result = db_query($sql,"No budget accounts were returned");
+
+       $row = db_fetch_row($result);
+       return $row[0];
+}
+
+//--------------------------------------------------------------------------------
+//     Stores journal/bank transaction tax details if applicable
+//
+function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate, $date, $memo, $included=0, $net_amount = null)
+{
+       $tax_type = is_tax_account($gl_code);
+       if(!$tax_type) return;  // $gl_code is not tax account
+       
+       $tax = get_tax_type($tax_type);
+       //if ($gl_code == $tax['sales_gl_code'])
+       if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTDELIVERY || $trans_type == ST_CUSTCREDIT)
+               $amount = -$amount;
+       // we have to restore net amount as we cannot know the base amount
+       if ($net_amount===null) {
+               if ($tax['rate'] == 0) {
+//                     display_warning(_("You should not post gl transactions  
+//                             to tax account with     zero tax rate."));
+                       $net_amount = 0;
+               } else { 
+                       // calculate net amount
+                       $net_amount = $amount/$tax['rate']*100; 
+               }
        }
+       add_trans_tax_details($trans_type, $trans_no, $tax['id'], $tax['rate'], $included, 
+               $amount, $net_amount, $ex_rate, $date, $memo);
 
-       add_comments($trans_type, $trans_id, $date_, $memo_);
+}
 
-       references::save($trans_type, $trans_id, $ref);
+//--------------------------------------------------------------------------------
+//
+//     Store transaction tax details for fiscal purposes with 'freezed' 
+//     actual tax type rate.
+//
+function add_trans_tax_details($trans_type, $trans_no, $tax_id, $rate, $included,
+       $amount, $net_amount, $ex_rate, $tran_date, $memo)
+{
 
-       if ($reverse) 
-       {
+       $sql = "INSERT INTO ".TB_PREF."trans_tax_details 
+               (trans_type, trans_no, tran_date, tax_type_id, rate, ex_rate,
+                       included_in_price, net_amount, amount, memo)
+               VALUES (".db_escape($trans_type)."," . db_escape($trans_no).",'"
+                               .date2sql($tran_date)."',".db_escape($tax_id).","
+                               .db_escape($rate).",".db_escape($ex_rate).",".($included ? 1:0).","
+                               .db_escape($net_amount).","
+                               .db_escape($amount).",".db_escape($memo).")";
 
-       $reversingDate = date(user_date_display(),
-               Mktime(0,0,0,get_month($date_)+1,1,get_year($date_)));
+       db_query($sql, "Cannot save trans tax details");
 
-       $trans_id_reverse = get_next_trans_no($trans_type);
+}
+//----------------------------------------------------------------------------------------
 
-       foreach ($items as $journal_item) 
-       {
-                       $is_bank_to = is_bank_account($journal_item->code_id);
+function get_trans_tax_details($trans_type, $trans_no)
+{
+       $sql = "SELECT ".TB_PREF."trans_tax_details.*, "
+               .TB_PREF."tax_types.name AS tax_type_name, "
+               .TB_PREF."trans_tax_details.rate AS effective_rate, "
+               .TB_PREF."tax_types.rate AS rate
+               FROM ".TB_PREF."trans_tax_details,".TB_PREF."tax_types
+               WHERE trans_type = ".db_escape($trans_type)."
+               AND trans_no = ".db_escape($trans_no)."
+               AND (net_amount != 0 OR amount != 0)
+               AND ".TB_PREF."tax_types.id = ".TB_PREF."trans_tax_details.tax_type_id";
+
+       return db_query($sql, "The transaction tax details could not be retrieved");
+}
 
-               add_gl_trans($trans_type, $trans_id_reverse, $reversingDate,
-                       $journal_item->code_id, $journal_item->dimension_id, $journal_item->dimension2_id, 
-                       $journal_item->reference, -$journal_item->amount);
-               if ($is_bank_to) 
-               {
-                       add_bank_trans($trans_type, $trans_id_reverse, $journal_item->code_id, $ref, 
-                               $reversingDate, 3, $journal_item->amount,
-                               0, "", get_company_currency(), 
-                               "Cannot insert a destination bank transaction");                                                                
-               }               
-       }
+//----------------------------------------------------------------------------------------
 
-       add_comments($trans_type, $trans_id_reverse, $reversingDate, $memo_);
+function void_trans_tax_details($type, $type_no)
+{
+       $sql = "UPDATE ".TB_PREF."trans_tax_details SET amount=0, net_amount=0
+               WHERE trans_no=".db_escape($type_no)
+               ." AND trans_type=".db_escape($type);
 
-       references::save($trans_type, $trans_id_reverse, $ref);
-       }
+       db_query($sql, "The transaction tax details could not be voided");
+}
 
-       commit_transaction();
+//----------------------------------------------------------------------------------------
 
-       return $trans_id;
+function clear_trans_tax_details($type, $type_no)
+{
+       $sql = "DELETE FROM ".TB_PREF."trans_tax_details 
+               WHERE trans_no=".db_escape($type_no)
+               ." AND trans_type=".db_escape($type);
+
+       db_query($sql, "The transaction tax details could not be cleared");
+}
+
+function get_tax_summary($from, $to)
+{
+       $fromdate = date2sql($from);
+       $todate = date2sql($to);
+
+       $sql = "SELECT 
+                               SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE
+                                       ." || trans_type=".ST_JOURNAL.",-1,1)*
+                               IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE 
+                                       ." || (trans_type=".ST_JOURNAL ." AND amount<0)"
+                                       ." || trans_type=".ST_CUSTCREDIT.", net_amount*ex_rate,0)) net_output,
+
+                               SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE
+                                       ." || trans_type=".ST_JOURNAL.",-1,1)*
+                               IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
+                                       ." || (trans_type=".ST_JOURNAL ." AND amount<0)"
+                                       ." || trans_type=".ST_CUSTCREDIT.", amount*ex_rate,0)) payable,
+
+                               SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE." || trans_type=".ST_JOURNAL.",-1,1)*
+                               IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
+                                       ." || (trans_type=".ST_JOURNAL ." AND amount<0)"
+                                       ." || trans_type=".ST_CUSTCREDIT.", 0, net_amount*ex_rate)) net_input,
+
+                               SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE." || trans_type=".ST_JOURNAL.",-1,1)*
+                               IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
+                                       ." || (trans_type=".ST_JOURNAL ." AND amount<0)"
+                                       ." || trans_type=".ST_CUSTCREDIT.", 0, amount*ex_rate)) collectible,
+                               taxrec.rate,
+                               ttype.id,
+                               ttype.name
+               FROM ".TB_PREF."tax_types ttype,
+                        ".TB_PREF."trans_tax_details taxrec
+               WHERE taxrec.tax_type_id=ttype.id
+                       AND taxrec.trans_type != ".ST_CUSTDELIVERY."
+                       AND taxrec.tran_date >= '$fromdate'
+                       AND taxrec.tran_date <= '$todate'
+               GROUP BY ttype.id";
+//display_error($sql);
+    return db_query($sql,"Cannot retrieve tax summary");
 }
 
 //--------------------------------------------------------------------------------------------------
 
 function exists_gl_trans($type, $trans_id)
 {
-       $sql = "SELECT type_no FROM ".TB_PREF."gl_trans WHERE type=$type AND type_no=$trans_id";
+       $sql = "SELECT type_no FROM ".TB_PREF."gl_trans WHERE type=".db_escape($type)
+               ." AND type_no=".db_escape($trans_id);
        $result = db_query($sql, "Cannot retreive a gl transaction");
 
     return (db_num_rows($result) > 0);
@@ -262,7 +493,8 @@ function void_gl_trans($type, $trans_id, $nested=false)
        if (!$nested)
                begin_transaction();
 
-       $sql = "UPDATE ".TB_PREF."gl_trans SET amount=0 WHERE type=$type AND type_no=$trans_id";
+       $sql = "UPDATE ".TB_PREF."gl_trans SET amount=0 WHERE type=".db_escape($type)
+       ." AND type_no=".db_escape($trans_id);
 
        db_query($sql, "could not void gl transactions for type=$type and trans_no=$trans_id");
 
@@ -270,6 +502,60 @@ function void_gl_trans($type, $trans_id, $nested=false)
                commit_transaction();
 }
 
-//--------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 
-?>
\ No newline at end of file
+function clear_gl_trans($type, $trans_id, $nested=false)
+{
+       if (!$nested)
+               begin_transaction();
+
+       $sql = "DELETE FROM ".TB_PREF."gl_trans WHERE type=".db_escape($type)
+       ." AND type_no=".db_escape($trans_id);
+
+       db_query($sql, "could not clear gl transactions for type=$type and trans_no=$trans_id");
+
+       if (!$nested)
+               commit_transaction();
+}
+
+function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $alsoclosed=false)
+{
+
+       $sql = "SELECT  IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
+               gl.tran_date,
+               gl.type,
+               gl.type_no,
+               refs.reference,
+               SUM(IF(gl.amount>0, gl.amount,0)) as amount,
+               com.memo_,
+               IF(ISNULL(u.user_id),'',u.user_id) as user_id
+               FROM ".TB_PREF."gl_trans as gl
+                LEFT JOIN ".TB_PREF."audit_trail as a ON
+                       (gl.type=a.type AND gl.type_no=a.trans_no)
+                LEFT JOIN ".TB_PREF."comments as com ON
+                       (gl.type=com.type AND gl.type_no=com.id)
+                LEFT JOIN ".TB_PREF."refs as refs ON
+                       (gl.type=refs.type AND gl.type_no=refs.id)
+                LEFT JOIN ".TB_PREF."users as u ON
+                       a.user=u.id
+               WHERE gl.tran_date >= '" . date2sql($from) . "'
+               AND gl.tran_date <= '" . date2sql($to) . "'
+               AND gl.amount!=0";
+       if ($ref) {
+               $sql .= " AND reference LIKE ". db_escape("%$ref%");
+       }
+       if ($memo) {
+               $sql .= " AND com.memo_ LIKE ". db_escape("%$memo%");
+       }
+       if ($filter != -1) {
+               $sql .= " AND gl.type=".db_escape($filter);
+       }
+       if (!$alsoclosed) {
+               $sql .= " AND gl_seq=0";
+       }
+       else
+               $sql .= " AND NOT ISNULL(a.gl_seq)";
+
+       $sql .= " GROUP BY gl.tran_date, a.gl_seq, gl.type, gl.type_no";
+       return $sql;
+}