Optimized gl_db_banking.inc, revaluation of AR/AP currencies

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

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index fc581e088be037aaca8abc86075471ad24dc7b95..80663e0bcbf42afdc47ec22add83f73579613638 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -115,7 +115,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
                AND ISNULL(v.date_)
                AND tran_date >= '$from'
                AND tran_date <= '$to'";
-       if (isset($show_voided_gl_trans) && $show_voided_gl_trans == 1)
+       if (isset($show_voided_gl_trans) && $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 ".db_escape('%'.$trans_no);
@@ -390,7 +390,9 @@ function add_trans_tax_details($trans_type, $trans_no, $tax_id, $rate, $included
 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."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)."